CVS commit: pkgsrc/x11/xfontsel

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul  1 08:12:08 UTC 2026

Modified Files:
        pkgsrc/x11/xfontsel: Makefile distinfo
Added Files:
        pkgsrc/x11/xfontsel/patches: patch-meson.build

Log Message:
xfontsel: add upstream patch fixing linking on NetBSD.

Remove workaround.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xfontsel/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xfontsel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xfontsel/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/xfontsel/Makefile
diff -u pkgsrc/x11/xfontsel/Makefile:1.15 pkgsrc/x11/xfontsel/Makefile:1.16
--- pkgsrc/x11/xfontsel/Makefile:1.15   Mon Jun 29 07:25:09 2026
+++ pkgsrc/x11/xfontsel/Makefile        Wed Jul  1 08:12:08 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2026/06/29 07:25:09 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2026/07/01 08:12:08 wiz Exp $
 
 DISTNAME=              xfontsel-1.1.2
+PKGREVISION=           1
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=          .tar.xz
@@ -13,8 +14,6 @@ USE_TOOLS+=           pkg-config
 
 MESON_ARGS+=           -Dappdefaultdir=${PREFIX}/lib/X11/app-defaults
 
-LDFLAGS+=              -lintl
-
 .include "../../devel/meson/build.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"

Index: pkgsrc/x11/xfontsel/distinfo
diff -u pkgsrc/x11/xfontsel/distinfo:1.10 pkgsrc/x11/xfontsel/distinfo:1.11
--- pkgsrc/x11/xfontsel/distinfo:1.10   Mon Jun 29 07:25:09 2026
+++ pkgsrc/x11/xfontsel/distinfo        Wed Jul  1 08:12:08 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.10 2026/06/29 07:25:09 wiz Exp $
+$NetBSD: distinfo,v 1.11 2026/07/01 08:12:08 wiz Exp $
 
 BLAKE2s (xfontsel-1.1.2.tar.xz) = baee544589c3f4d7a6cabb8cb709abea6fce297fd13e01a2f2720666106dfb04
 SHA512 (xfontsel-1.1.2.tar.xz) = 377ef4e95f68411716a9cd202f4b2468ef5638d53ebd058518bdf97319f8008052f2cb76154503a1eae76aae3ce27dfa7334428b66f738a087d0915bef69c603
 Size (xfontsel-1.1.2.tar.xz) = 148792 bytes
+SHA1 (patch-meson.build) = 6e7495443ef25c8b087c1393cb96aef9612c5538

Added files:

Index: pkgsrc/x11/xfontsel/patches/patch-meson.build
diff -u /dev/null pkgsrc/x11/xfontsel/patches/patch-meson.build:1.1
--- /dev/null   Wed Jul  1 08:12:08 2026
+++ pkgsrc/x11/xfontsel/patches/patch-meson.build       Wed Jul  1 08:12:08 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-meson.build,v 1.1 2026/07/01 08:12:08 wiz Exp $
+
+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/xfontsel/-/merge_requests/18
+
+--- meson.build.orig   2026-06-29 01:07:03.000000000 +0000
++++ meson.build
+@@ -51,10 +51,12 @@ deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_libx11,
+ deps = [dep_libxaw, dep_libxmu, dep_libxt, dep_libx11, dep_xproto]
+ 
+ # Internationalization & localization support
+-use_gettext = cc.has_function('gettext')
++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)
++  use_gettext = cc.has_function('gettext', dependencies: dep_libintl,
++                                prefix: libintl_prefix)
+   if use_gettext == true
+     deps += dep_libintl
+   endif