head 1.2; access; symbols pkgsrc-2026Q3:1.2.0.2 pkgsrc-2026Q3-base:1.2; locks; strict; comment @# @; 1.2 date 2026.09.16.04.35.08; author wiz; state Exp; branches; next 1.1; commitid tn293LB7zTUqLNVG; 1.1 date 2026.09.15.11.34.22; author wiz; state Exp; branches; next ; commitid EJszSB4EhDhe7IVG; desc @@ 1.2 log @xfd: use upstream variant of patch @ text @$NetBSD$ meson: include libintl.h when checking for gettext() 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,10 +45,12 @@@@ deps = [] deps = [] # Internationalization & localization support -use_gettext = cc.has_function('gettext') +libintl_prefix = '#include ' +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 @ 1.1 log @xfd: try fixing build with native X @ text @d3 1 a3 1 Always check for libintl first. d5 7 a11 1 --- meson.build.orig 2026-09-15 11:32:57.941157609 +0000 d13 1 a13 1 @@@@ -45,13 +45,10 @@@@ deps = [] d18 4 a21 2 -if use_gettext == false - dep_libintl = cc.find_library('intl', required: false) d23 5 a27 10 - 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.') @