CVS commit: pkgsrc/x11/xfd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Sep 16 04:35:08 UTC 2026

Modified Files:
        pkgsrc/x11/xfd: distinfo
        pkgsrc/x11/xfd/patches: patch-meson.build

Log Message:
xfd: use upstream variant of patch


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xfd/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xfd/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfd/distinfo
diff -u pkgsrc/x11/xfd/distinfo:1.10 pkgsrc/x11/xfd/distinfo:1.11
--- pkgsrc/x11/xfd/distinfo:1.10        Tue Sep 15 11:34:22 2026
+++ pkgsrc/x11/xfd/distinfo     Wed Sep 16 04:35:08 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2026/09/15 11:34:22 wiz Exp $
+$NetBSD: distinfo,v 1.11 2026/09/16 04:35:08 wiz Exp $
 
 BLAKE2s (xfd-1.1.5.tar.xz) = 026676ced2c64a476e62da07710d8c72ecbbc24767b9ae8777563a9e3c90b772
 SHA512 (xfd-1.1.5.tar.xz) = 6a8838e90c4751ae357832da7856d65d2cc65f3626655e24d22b25e7623f1a47d41dea0d093c0f250ceee2651214a746b3e7bd7f152c5b1718ce28aa5f217fa4
 Size (xfd-1.1.5.tar.xz) = 140548 bytes
-SHA1 (patch-meson.build) = 82db3925ebcd0953b9d6d4df12cda4d9bb3c4fb2
+SHA1 (patch-meson.build) = c2ba9c6ebf70c9d9826c0085cdb921200c64369c

Index: pkgsrc/x11/xfd/patches/patch-meson.build
diff -u pkgsrc/x11/xfd/patches/patch-meson.build:1.1 pkgsrc/x11/xfd/patches/patch-meson.build:1.2
--- pkgsrc/x11/xfd/patches/patch-meson.build:1.1        Tue Sep 15 11:34:22 2026
+++ pkgsrc/x11/xfd/patches/patch-meson.build    Wed Sep 16 04:35:08 2026
@@ -1,24 +1,27 @@
-$NetBSD: patch-meson.build,v 1.1 2026/09/15 11:34:22 wiz Exp $
+$NetBSD: patch-meson.build,v 1.2 2026/09/16 04:35:08 wiz Exp $
 
-Always check for libintl first.
+meson: include libintl.h when checking for gettext()
 
---- meson.build.orig   2026-09-15 11:32:57.941157609 +0000
+Trying to workaround https://github.com/mesonbuild/meson/issues/3740
+which causes meson to fail to detect it needs to link against libintl
+for gettext() on NetBSD.
+
+https://gitlab.freedesktop.org/xorg/app/xfd/-/commit/4261cb09d5aa30f8dce0ee70f565dc242a75873c
+
+--- meson.build.orig   2026-01-25 00:52:23.000000000 +0000
 +++ meson.build
-@@ -45,13 +45,10 @@ deps = []
+@@ -45,10 +45,12 @@ deps = []
  deps = []
  
  # Internationalization & localization support
 -use_gettext = cc.has_function('gettext')
--if use_gettext == false
--  dep_libintl = cc.find_library('intl', required: false)
++libintl_prefix = '#include <libintl.h>'
++use_gettext = cc.has_function('gettext', prefix: libintl_prefix)
+ if use_gettext == false
+   dep_libintl = cc.find_library('intl', required: false)
 -  use_gettext = cc.has_function('gettext', dependencies: dep_libintl)
--  if use_gettext == true
--    deps += dep_libintl
--  endif
-+dep_libintl = cc.find_library('intl', required: false)
-+use_gettext = cc.has_function('gettext', dependencies: dep_libintl)
-+if use_gettext == true
-+  deps += dep_libintl
- endif
- conf.set('USE_GETTEXT', use_gettext ? 1 : false,
-          description: 'Define to 1 if you want to use the gettext() function.')
++  use_gettext = cc.has_function('gettext', dependencies: dep_libintl,
++                                prefix: libintl_prefix)
+   if use_gettext == true
+     deps += dep_libintl
+   endif