diff options
Diffstat (limited to 'devel')
21 files changed, 114 insertions, 486 deletions
diff --git a/devel/gdbus-codegen/Makefile b/devel/gdbus-codegen/Makefile index 8b44f7de27d..757a855a3a6 100644 --- a/devel/gdbus-codegen/Makefile +++ b/devel/gdbus-codegen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2019/10/07 09:28:10 prlw1 Exp $ +# $NetBSD: Makefile,v 1.22 2020/03/04 15:11:48 wiz Exp $ .include "../../devel/glib2/Makefile.common" @@ -15,6 +15,8 @@ SUBST_MESSAGE.autovars= autoconf meson.build SUBST_FILES.autovars= meson.build config.py.in gdbus-codegen.in SUBST_VARS.autovars= PKGVERSION PYTHONBIN SUBST_SED.autovars= -e 's,@VERSION@,${PKGVERSION:Q},' +SUBST_SED.autovars+= -e 's,@MAJORVERSION@,${PKGVERSION:R:R:Q},' +SUBST_SED.autovars+= -e 's,@MINORVERSION@,${PKGVERSION:R:E:Q},' SUBST_SED.autovars+= -e 's,@PYTHON@,${PYTHONBIN:Q},' SUBST_SED.autovars+= -e 's,@DATADIR@,${PREFIX}/share,' diff --git a/devel/gdbus-codegen/distinfo b/devel/gdbus-codegen/distinfo index 5880941b824..9e5612b7791 100644 --- a/devel/gdbus-codegen/distinfo +++ b/devel/gdbus-codegen/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2019/12/29 19:41:43 triaxx Exp $ +$NetBSD: distinfo,v 1.9 2020/03/04 15:11:48 wiz Exp $ -SHA1 (glib-2.62.4.tar.xz) = f9a493c86f98482f13c6ed742c19487e6fa8f34b -RMD160 (glib-2.62.4.tar.xz) = 4cac1bc54a690b007c859db2e9d65c33dc97395c -SHA512 (glib-2.62.4.tar.xz) = d54411c664281bb6770f57e58c69ac28d1eb76802cb73e9a2bca94b9d5d62441d80cf78d19d1124dadddcce385d3dff3824c019dc00ed2b10af48a69006766fa -Size (glib-2.62.4.tar.xz) = 4684768 bytes -SHA1 (patch-meson.build) = 6877b395f02619ea93b648119373ac1b53438c59 +SHA1 (glib-2.64.0.tar.xz) = 73c3395608b623de5e4611b90fc1f90553814f59 +RMD160 (glib-2.64.0.tar.xz) = 45790f3cb7e5c51134063d05c3ad0cd3a9daafb0 +SHA512 (glib-2.64.0.tar.xz) = d843d26e265529677d3eb1bf342c8c39dea47455a32588285583be6ea77214c532b9246523c458f3b2a01bbd1a6c73761fa0fef5fe6f4a5cea6c885d27b53510 +Size (glib-2.64.0.tar.xz) = 4758748 bytes +SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999 diff --git a/devel/gdbus-codegen/patches/patch-meson.build b/devel/gdbus-codegen/patches/patch-meson.build index 7e03835359d..8dcf2ad7d9d 100644 --- a/devel/gdbus-codegen/patches/patch-meson.build +++ b/devel/gdbus-codegen/patches/patch-meson.build @@ -1,9 +1,9 @@ -$NetBSD: patch-meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $ +$NetBSD: patch-meson.build,v 1.2 2020/03/04 15:11:49 wiz Exp $ Turn into a meson.build file which meson will accept, and subsitute some variables. ---- meson.build.orig 2019-04-15 10:54:04.000000000 +0000 +--- meson.build.orig 2020-02-27 16:12:52.000000000 +0000 +++ meson.build @@ -1,3 +1,5 @@ +project('gdbus_codegen') @@ -11,16 +11,29 @@ subsitute some variables. gdbus_codegen_files = [ '__init__.py', 'codegen.py', -@@ -9,9 +11,9 @@ gdbus_codegen_files = [ +@@ -9,11 +11,11 @@ gdbus_codegen_files = [ ] gdbus_codegen_conf = configuration_data() -gdbus_codegen_conf.set('VERSION', glib_version) +-gdbus_codegen_conf.set('MAJOR_VERSION', major_version) +-gdbus_codegen_conf.set('MINOR_VERSION', minor_version) -gdbus_codegen_conf.set('PYTHON', python_name) -gdbus_codegen_conf.set('DATADIR', glib_datadir) +gdbus_codegen_conf.set('VERSION', '@VERSION@') ++gdbus_codegen_conf.set('MAJOR_VERSION', '@MAJOR_VERSION@') ++gdbus_codegen_conf.set('MINOR_VERSION', '@MINOR_VERSION@') +gdbus_codegen_conf.set('PYTHON', '@PYTHON@') +gdbus_codegen_conf.set('DATADIR', '@DATADIR@') # Install gdbus-codegen executable gdbus_codegen = configure_file(input : 'gdbus-codegen.in', +@@ -24,7 +26,7 @@ gdbus_codegen = configure_file(input : ' + # Provide tools for others when we're a subproject and they use the Meson GNOME module + meson.override_find_program('gdbus-codegen', gdbus_codegen) + +-codegen_dir = join_paths(glib_datadir, 'glib-2.0', 'codegen') ++codegen_dir = join_paths('@DATADIR@', 'glib-2.0', 'codegen') + + gdbus_codegen_built_files = [] + gdbus_codegen_built_files += configure_file(input : 'config.py.in', diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 5c4deeaa580..285a8907153 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.267 2020/02/07 17:05:14 prlw1 Exp $ +# $NetBSD: Makefile,v 1.268 2020/03/04 15:11:48 wiz Exp $ .include "Makefile.common" -PKGREVISION= 1 CATEGORIES= devel gnome COMMENT= Some useful routines for C programming (glib2) @@ -10,7 +9,7 @@ COMMENT= Some useful routines for C programming (glib2) MESON_ARGS+= -Dinstalled_tests=false # Avoid linux dependency on libmount-dev -MESON_ARGS+= -Dlibmount=false +MESON_ARGS+= -Dlibmount=disabled MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/output/gobject:${WRKSRC}/output/gmodule @@ -20,6 +19,8 @@ LDFLAGS.FreeBSD+= -liconv REPLACE_PYTHON+= gio/gio-querymodules-wrapper.py REPLACE_PYTHON+= gio/tests/gengiotypefuncs.py +REPLACE_PYTHON+= gio/tests/memory-monitor-dbus.py.in +REPLACE_PYTHON+= gio/tests/memory-monitor-portal.py.in REPLACE_PYTHON+= gio/tests/static-link.py REPLACE_PYTHON+= glib/update-gtranslit.py REPLACE_PYTHON+= gobject/tests/mkenums.py diff --git a/devel/glib2/Makefile.common b/devel/glib2/Makefile.common index c60757c7a33..df9e41e0b0b 100644 --- a/devel/glib2/Makefile.common +++ b/devel/glib2/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.77 2019/12/29 19:40:56 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.78 2020/03/04 15:11:48 wiz Exp $ # used by devel/gdbus-codegen/Makefile # used by devel/glib2/Makefile # used by devel/glib2-tools/Makefile -DISTNAME= glib-2.62.4 +DISTNAME= glib-2.64.0 PKGNAME= ${DISTNAME:S/glib/glib2/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/} EXTRACT_SUFX= .tar.xz diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST index 4ab0bbd2b31..79422bb41f8 100644 --- a/devel/glib2/PLIST +++ b/devel/glib2/PLIST @@ -1,8 +1,7 @@ -@comment $NetBSD: PLIST,v 1.113 2019/12/29 23:02:06 wiz Exp $ +@comment $NetBSD: PLIST,v 1.114 2020/03/04 15:11:48 wiz Exp $ ${PLIST.nococoa}bin/gapplication bin/gdbus bin/gio -${PLIST.nococoa}bin/gio-launch-desktop bin/gio-querymodules bin/glib-compile-resources bin/glib-compile-schemas @@ -101,6 +100,7 @@ include/glib-2.0/gio/glistmodel.h include/glib-2.0/gio/gliststore.h include/glib-2.0/gio/gloadableicon.h include/glib-2.0/gio/gmemoryinputstream.h +include/glib-2.0/gio/gmemorymonitor.h include/glib-2.0/gio/gmemoryoutputstream.h include/glib-2.0/gio/gmenu.h include/glib-2.0/gio/gmenuexporter.h @@ -282,19 +282,19 @@ ${PLIST.fam}lib/gio/modules/libgiofam.so lib/glib-2.0/include/glibconfig.h lib/libgio-2.0.so lib/libgio-2.0.so.0 -lib/libgio-2.0.so.0.6200.4 +lib/libgio-2.0.so.0.6400.0 lib/libglib-2.0.so lib/libglib-2.0.so.0 -lib/libglib-2.0.so.0.6200.4 +lib/libglib-2.0.so.0.6400.0 lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0 -lib/libgmodule-2.0.so.0.6200.4 +lib/libgmodule-2.0.so.0.6400.0 lib/libgobject-2.0.so lib/libgobject-2.0.so.0 -lib/libgobject-2.0.so.0.6200.4 +lib/libgobject-2.0.so.0.6400.0 lib/libgthread-2.0.so lib/libgthread-2.0.so.0 -lib/libgthread-2.0.so.0.6200.4 +lib/libgthread-2.0.so.0.6400.0 lib/pkgconfig/gio-2.0.pc lib/pkgconfig/gio-unix-2.0.pc lib/pkgconfig/glib-2.0.pc @@ -303,11 +303,13 @@ lib/pkgconfig/gmodule-export-2.0.pc lib/pkgconfig/gmodule-no-export-2.0.pc lib/pkgconfig/gobject-2.0.pc lib/pkgconfig/gthread-2.0.pc +libexec/installed-tests/glib/memory-monitor-dbus.py +libexec/installed-tests/glib/memory-monitor-portal.py share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/aclocal/gsettings.m4 -share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6200.4-gdb.py -share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6200.4-gdb.py +share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.6400.0-gdb.py +share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.6400.0-gdb.py share/gettext/its/gschema.its share/gettext/its/gschema.loc share/glib-2.0/gdb/glib_gdb.py @@ -315,6 +317,8 @@ share/glib-2.0/gdb/gobject_gdb.py share/glib-2.0/gettext/po/Makefile.in.in share/glib-2.0/schemas/gschema.dtd share/glib-2.0/valgrind/glib.supp +share/installed-tests/glib/memory-monitor-dbus.test +share/installed-tests/glib/memory-monitor-portal.test share/locale/af/LC_MESSAGES/glib20.mo share/locale/am/LC_MESSAGES/glib20.mo share/locale/an/LC_MESSAGES/glib20.mo diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 883278b011e..44198f7c495 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.267 2020/02/07 17:05:14 prlw1 Exp $ +$NetBSD: distinfo,v 1.268 2020/03/04 15:11:48 wiz Exp $ -SHA1 (glib-2.62.4.tar.xz) = f9a493c86f98482f13c6ed742c19487e6fa8f34b -RMD160 (glib-2.62.4.tar.xz) = 4cac1bc54a690b007c859db2e9d65c33dc97395c -SHA512 (glib-2.62.4.tar.xz) = d54411c664281bb6770f57e58c69ac28d1eb76802cb73e9a2bca94b9d5d62441d80cf78d19d1124dadddcce385d3dff3824c019dc00ed2b10af48a69006766fa -Size (glib-2.62.4.tar.xz) = 4684768 bytes +SHA1 (glib-2.64.0.tar.xz) = 73c3395608b623de5e4611b90fc1f90553814f59 +RMD160 (glib-2.64.0.tar.xz) = 45790f3cb7e5c51134063d05c3ad0cd3a9daafb0 +SHA512 (glib-2.64.0.tar.xz) = d843d26e265529677d3eb1bf342c8c39dea47455a32588285583be6ea77214c532b9246523c458f3b2a01bbd1a6c73761fa0fef5fe6f4a5cea6c885d27b53510 +Size (glib-2.64.0.tar.xz) = 4758748 bytes SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4 SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed @@ -13,23 +13,17 @@ SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a -SHA1 (patch-gio_tests_meson.build) = aadb773caa5f120f47a4182ae364e9d257839e6c -SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8 -SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1 -SHA1 (patch-glib_genviron.c) = 7182f5ef2ebc7f17d8d4fb892e946c52c8c0ad1d +SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6 +SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8 +SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97 SHA1 (patch-glib_gmacros.h) = b2737b6b089556ca9bb54176a41371042e329b9c -SHA1 (patch-glib_gmain.c) = 4c834b3cb35b1e64b77dfe15f4b3aa01d4d5daa1 -SHA1 (patch-glib_gspawn.c) = 17a6f1b38660123eafd6fb66966eb240dee26db7 -SHA1 (patch-glib_meson.build) = cafd7c607407208408be46c44ce2f238a2b56fd2 -SHA1 (patch-glib_tests_hash.c) = bb1535fbd3910d45aa2f70bd6e188692e8d02358 +SHA1 (patch-glib_gmain.c) = a50bf85d640d63bb901ad26afca933df52e6ccbd +SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294 +SHA1 (patch-glib_meson.build) = 8a45f4e32d9db8c0406908bef332ec81237d0cdf +SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0 SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4 -SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8 -SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4 -SHA1 (patch-gmodule_gmodule-dyld.c) = 5adf62970d9cff22d451307aaa0b00d975dab138 -SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd -SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d -SHA1 (patch-meson.build) = 3265900b1e44f139ddbf0e4cbbe61328f9c8bd34 +SHA1 (patch-meson.build) = 85700da2a55f7c5791f6fa6cd9adf264c61451f8 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54 diff --git a/devel/glib2/patches/patch-gio_tests_meson.build b/devel/glib2/patches/patch-gio_tests_meson.build deleted file mode 100644 index 7b39aeaac25..00000000000 --- a/devel/glib2/patches/patch-gio_tests_meson.build +++ /dev/null @@ -1,101 +0,0 @@ -$NetBSD: patch-gio_tests_meson.build,v 1.2 2020/01/23 23:54:22 sevan Exp $ - -Darwin: Set LD_LIBRARY_PATH to run uninstalled executable with @rpath. -Check objcopy(1) supports --add-symbol which may not be available on -legacy systems. -https://gitlab.gnome.org/GNOME/glib/commit/dac4a48d14461a118d8ad7825a39e224bf128807 - ---- gio/tests/meson.build.orig 2019-12-19 16:33:15.000000000 +0000 -+++ gio/tests/meson.build -@@ -470,7 +470,9 @@ if not meson.is_cross_build() or meson.h - plugin_resources_c = custom_target('plugin-resources.c', - input : 'test4.gresource.xml', - output : 'plugin-resources.c', -- command : [glib_compile_resources, -+ command : [env_program.path(), -+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject', -+ glib_compile_resources, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate-source', -@@ -494,7 +496,9 @@ if not meson.is_cross_build() or meson.h - test_gresource = custom_target('test.gresource', - input : 'test.gresource.xml', - output : 'test.gresource', -- command : [glib_compile_resources, -+ command : [env_program.path(), -+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject', -+ glib_compile_resources, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), -@@ -505,7 +509,9 @@ if not meson.is_cross_build() or meson.h - test_resources2_c = custom_target('test_resources2.c', - input : 'test3.gresource.xml', - output : 'test_resources2.c', -- command : [glib_compile_resources, -+ command : [env_program.path(), -+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject', -+ glib_compile_resources, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -516,7 +522,9 @@ if not meson.is_cross_build() or meson.h - test_resources2_h = custom_target('test_resources2.h', - input : 'test3.gresource.xml', - output : 'test_resources2.h', -- command : [glib_compile_resources, -+ command : [env_program.path(), -+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject', -+ glib_compile_resources, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -528,7 +536,9 @@ if not meson.is_cross_build() or meson.h - input : 'test2.gresource.xml', - depends : big_test_resource, - output : 'test_resources.c', -- command : [glib_compile_resources, -+ command : [env_program.path(), -+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject', -+ glib_compile_resources, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), -@@ -539,7 +549,9 @@ if not meson.is_cross_build() or meson.h - digit_test_resources_c = custom_target('digit_test_resources.c', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.c', -- command : [glib_compile_resources, -+ command : [env_program.path(), -+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject', -+ glib_compile_resources, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--sourcedir=' + meson.current_build_dir(), -@@ -550,7 +562,9 @@ if not meson.is_cross_build() or meson.h - digit_test_resources_h = custom_target('digit_test_resources.h', - input : '111_digit_test.gresource.xml', - output : 'digit_test_resources.h', -- command : [glib_compile_resources, -+ command : [env_program.path(), -+ 'LD_LIBRARY_PATH=gio:glib:gmodule:gobject', -+ glib_compile_resources, - '--target=@OUTPUT@', - '--sourcedir=' + meson.current_source_dir(), - '--generate', -@@ -577,9 +591,13 @@ if not meson.is_cross_build() or meson.h - # Support for --add-symbol was added to LLVM objcopy in 2019 - # (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for - # LLVM once that support is in a stable release. -+ objcopy_valid = false - objcopy = find_program('objcopy', required : false) -+ if objcopy.found() -+ objcopy_valid = run_command(objcopy, '--help').stdout().contains('--add-symbol') -+ endif - -- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() -+ if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_valid - test_gresource_binary = custom_target('test5.gresource', - input : 'test5.gresource.xml', - output : 'test5.gresource', diff --git a/devel/glib2/patches/patch-glib_gatomic.c b/devel/glib2/patches/patch-glib_gatomic.c index a1b40e9adc5..c2585a84f05 100644 --- a/devel/glib2/patches/patch-glib_gatomic.c +++ b/devel/glib2/patches/patch-glib_gatomic.c @@ -1,9 +1,9 @@ -$NetBSD: patch-glib_gatomic.c,v 1.1 2019/06/26 10:42:50 prlw1 Exp $ +$NetBSD: patch-glib_gatomic.c,v 1.2 2020/03/04 15:11:48 wiz Exp $ Ignore __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 as is already done for android and linux. PR pkg/54298 ---- glib/gatomic.c.orig 2019-06-10 17:47:20.000000000 +0000 +--- glib/gatomic.c.orig 2020-02-27 16:12:52.000000000 +0000 +++ glib/gatomic.c @@ -94,8 +94,6 @@ * implement the atomic operations in a lock-free manner. @@ -11,10 +11,10 @@ for android and linux. PR pkg/54298 -#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) - - #if defined(__ATOMIC_SEQ_CST) && !defined(__clang__) - /* The implementation used in this code path in gatomic.h assumes - * 4-byte int */ -@@ -667,14 +665,6 @@ gsize + /** + * g_atomic_int_get: + * @atomic: a pointer to a #gint or #guint +@@ -658,14 +656,6 @@ gsize return InterlockedXor (atomic, val); #endif } diff --git a/devel/glib2/patches/patch-glib_gatomic.h b/devel/glib2/patches/patch-glib_gatomic.h index cbe9c6e8a25..f7f7b3507d5 100644 --- a/devel/glib2/patches/patch-glib_gatomic.h +++ b/devel/glib2/patches/patch-glib_gatomic.h @@ -1,9 +1,9 @@ -$NetBSD: patch-glib_gatomic.h,v 1.1 2019/06/26 10:42:50 prlw1 Exp $ +$NetBSD: patch-glib_gatomic.h,v 1.2 2020/03/04 15:11:48 wiz Exp $ Ignore __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 as is already done for android and linux. PR pkg/54298 ---- glib/gatomic.h.orig 2019-06-10 17:47:20.000000000 +0000 +--- glib/gatomic.h.orig 2020-02-27 16:12:52.000000000 +0000 +++ glib/gatomic.h @@ -82,7 +82,7 @@ gint g_atomic_int_exc @@ -13,10 +13,10 @@ for android and linux. PR pkg/54298 +#if defined(G_ATOMIC_LOCK_FREE) /* We prefer the new C11-style atomic extension of GCC if available */ - #if defined(__ATOMIC_SEQ_CST) && !defined(__clang__) -@@ -250,7 +250,7 @@ G_END_DECLS - (gsize) __sync_fetch_and_xor ((atomic), (val)); \ - })) + #if defined(__ATOMIC_SEQ_CST) +@@ -372,7 +372,7 @@ G_END_DECLS + + #endif /* !defined(__ATOMIC_SEQ_CST) */ -#else /* defined(G_ATOMIC_LOCK_FREE) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) */ +#else /* defined(G_ATOMIC_LOCK_FREE) */ diff --git a/devel/glib2/patches/patch-glib_genviron.c b/devel/glib2/patches/patch-glib_genviron.c index d70aeedfc7c..ff26525214c 100644 --- a/devel/glib2/patches/patch-glib_genviron.c +++ b/devel/glib2/patches/patch-glib_genviron.c @@ -1,11 +1,11 @@ -$NetBSD: patch-glib_genviron.c,v 1.1 2019/12/29 19:40:56 triaxx Exp $ +$NetBSD: patch-glib_genviron.c,v 1.2 2020/03/04 15:11:48 wiz Exp $ Avoid the build failure with Clang on FreeBSD (see PR 54752). Set environ as a weak symbol (thanks to Joerg). ---- glib/genviron.c.orig 2019-12-19 16:33:15.000000000 +0000 +--- glib/genviron.c.orig 2020-02-27 16:12:52.000000000 +0000 +++ glib/genviron.c -@@ -321,7 +321,11 @@ g_setenv (const gchar *variable, +@@ -329,8 +329,12 @@ g_setenv (const gchar *variable, /* According to the Single Unix Specification, environ is not * in any system header, although unistd.h often declares it. */ @@ -13,7 +13,8 @@ Set environ as a weak symbol (thanks to Joerg). +extern __attribute__((__weak__)) char **environ; +#else extern char **environ; -+#endif #endif ++#endif /** + * g_unsetenv: diff --git a/devel/glib2/patches/patch-glib_gmain.c b/devel/glib2/patches/patch-glib_gmain.c index 85c2955cd5d..33da84fffa0 100644 --- a/devel/glib2/patches/patch-glib_gmain.c +++ b/devel/glib2/patches/patch-glib_gmain.c @@ -1,4 +1,4 @@ -$NetBSD: patch-glib_gmain.c,v 1.4 2019/12/29 19:40:56 triaxx Exp $ +$NetBSD: patch-glib_gmain.c,v 1.5 2020/03/04 15:11:48 wiz Exp $ Imported patch from the upstream Bugzilla: @@ -7,9 +7,9 @@ Imported patch from the upstream Bugzilla: Tested on powerpc-apple-darwin9. ---- glib/gmain.c.orig 2019-12-19 16:33:15.000000000 +0000 +--- glib/gmain.c.orig 2020-02-27 16:12:52.000000000 +0000 +++ glib/gmain.c -@@ -2758,47 +2758,31 @@ g_get_monotonic_time (void) +@@ -2886,47 +2886,31 @@ g_get_monotonic_time (void) gint64 g_get_monotonic_time (void) { @@ -18,12 +18,7 @@ Tested on powerpc-apple-darwin9. + guint64 val; - if (timebase_info.denom == 0) -+ /* we get nanoseconds from mach_absolute_time() using timebase_info */ -+ mach_timebase_info (&timebase_info); -+ val = mach_absolute_time(); -+ -+ if (timebase_info.numer != timebase_info.denom) - { +- { - /* This is a fraction that we must use to scale - * mach_absolute_time() by in order to reach nanoseconds. - * @@ -32,9 +27,7 @@ Tested on powerpc-apple-darwin9. - * picoseconds. Try to deal nicely with that. - */ - mach_timebase_info (&timebase_info); -+ guint64 t_high, t_low; -+ guint64 result_high, result_low; - +- - /* We actually want microseconds... */ - if (timebase_info.numer % 1000 == 0) - timebase_info.numer /= 1000; @@ -60,6 +53,15 @@ Tested on powerpc-apple-darwin9. - g_error ("Got weird mach timebase info of %d/%d. Please file a bug against GLib.", - timebase_info.numer, timebase_info.denom); - } ++ /* we get nanoseconds from mach_absolute_time() using timebase_info */ ++ mach_timebase_info (&timebase_info); ++ val = mach_absolute_time(); ++ ++ if (timebase_info.numer != timebase_info.denom) ++ { ++ guint64 t_high, t_low; ++ guint64 result_high, result_low; ++ + /* 64 bit x 32 bit / 32 bit with 96-bit intermediate + * algorithm lifted from qemu */ + t_low = (val & 0xffffffffLL) * (guint64)timebase_info.numer; diff --git a/devel/glib2/patches/patch-glib_gspawn.c b/devel/glib2/patches/patch-glib_gspawn.c index 482c6f5f9d6..69636285fd9 100644 --- a/devel/glib2/patches/patch-glib_gspawn.c +++ b/devel/glib2/patches/patch-glib_gspawn.c @@ -1,11 +1,11 @@ -$NetBSD: patch-glib_gspawn.c,v 1.1 2019/12/29 19:40:56 triaxx Exp $ +$NetBSD: patch-glib_gspawn.c,v 1.2 2020/03/04 15:11:48 wiz Exp $ Avoid the build failure with Clang on FreeBSD (see PR 54752). Set environ as a weak symbol (thanks to Joerg). ---- glib/gspawn.c.orig 2019-12-19 16:33:15.000000000 +0000 +--- glib/gspawn.c.orig 2020-02-27 16:12:52.000000000 +0000 +++ glib/gspawn.c -@@ -85,7 +85,11 @@ +@@ -85,8 +85,12 @@ #ifdef HAVE__NSGETENVIRON #define environ (*_NSGetEnviron()) #else @@ -13,7 +13,8 @@ Set environ as a weak symbol (thanks to Joerg). +extern __attribute__((__weak__)) char **environ; +#else extern char **environ; -+#endif #endif ++#endif #ifndef O_CLOEXEC + #define O_CLOEXEC 0 diff --git a/devel/glib2/patches/patch-glib_meson.build b/devel/glib2/patches/patch-glib_meson.build index 877e7493978..e8b6c533327 100644 --- a/devel/glib2/patches/patch-glib_meson.build +++ b/devel/glib2/patches/patch-glib_meson.build @@ -1,10 +1,10 @@ -$NetBSD: patch-glib_meson.build,v 1.7 2019/12/29 19:40:56 triaxx Exp $ +$NetBSD: patch-glib_meson.build,v 1.8 2020/03/04 15:11:48 wiz Exp $ - On Darwin, allow building without Cocoa. - Don't bother with gtester as it's slated for deprecation anyway: https://gitlab.gnome.org/GNOME/glib/issues/1441 ---- glib/meson.build.orig 2019-12-19 16:33:15.000000000 +0000 +--- glib/meson.build.orig 2020-02-27 16:12:52.000000000 +0000 +++ glib/meson.build @@ -316,7 +316,7 @@ else platform_deps = [] @@ -15,7 +15,7 @@ $NetBSD: patch-glib_meson.build,v 1.7 2019/12/29 19:40:56 triaxx Exp $ glib_sources += files('gosxutils.m') endif -@@ -410,24 +410,7 @@ if host_system == 'windows' +@@ -410,25 +410,8 @@ if host_system == 'windows' include_directories : configinc, dependencies : [libglib_dep]) endif @@ -26,7 +26,7 @@ $NetBSD: patch-glib_meson.build,v 1.7 2019/12/29 19:40:56 triaxx Exp $ - include_directories : configinc, - dependencies : [libglib_dep]) endif -- + -report_conf = configuration_data() -report_conf.set('GLIB_VERSION', glib_version) -report_conf.set('PYTHON', python_name) @@ -37,6 +37,7 @@ $NetBSD: patch-glib_meson.build,v 1.7 2019/12/29 19:40:56 triaxx Exp $ - configuration: report_conf, - install_mode: 'rwxr-xr-x' -) - +- install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) + gdb_conf = configuration_data() diff --git a/devel/glib2/patches/patch-glib_tests_hash.c b/devel/glib2/patches/patch-glib_tests_hash.c index 0955bee8934..800d81eea3f 100644 --- a/devel/glib2/patches/patch-glib_tests_hash.c +++ b/devel/glib2/patches/patch-glib_tests_hash.c @@ -1,11 +1,11 @@ -$NetBSD: patch-glib_tests_hash.c,v 1.2 2019/12/29 19:40:56 triaxx Exp $ +$NetBSD: patch-glib_tests_hash.c,v 1.3 2020/03/04 15:11:48 wiz Exp $ Revert GHashTable improvements https://gitlab.gnome.org/GNOME/glib/merge_requests/208 to fix PR pkg/54310 ---- glib/tests/hash.c.orig 2019-12-19 16:33:15.000000000 +0000 +--- glib/tests/hash.c.orig 2020-02-27 16:12:52.000000000 +0000 +++ glib/tests/hash.c @@ -1353,9 +1353,6 @@ struct _GHashTable gint nnodes; @@ -17,7 +17,7 @@ to fix PR pkg/54310 gpointer *keys; guint *hashes; gpointer *values; -@@ -1390,23 +1387,6 @@ count_keys (GHashTable *h, gint *unused, gint *occupie +@@ -1390,23 +1387,6 @@ count_keys (GHashTable *h, gint *unused, } } @@ -47,13 +47,13 @@ to fix PR pkg/54310 { - if (h->hashes[i] >= 2) + if (h->hashes[i] < 2) - { -- g_assert_cmpint (h->hashes[i], ==, h->hash_func (fetch_key_or_value (h->keys, i, h->have_big_keys))); ++ { + g_assert (h->keys[i] == NULL); + g_assert (h->values[i] == NULL); + } + else -+ { + { +- g_assert_cmpint (h->hashes[i], ==, h->hash_func (fetch_key_or_value (h->keys, i, h->have_big_keys))); + g_assert_cmpint (h->hashes[i], ==, h->hash_func (h->keys[i])); } } diff --git a/devel/glib2/patches/patch-gmodule_gmodule-ar.c b/devel/glib2/patches/patch-gmodule_gmodule-ar.c deleted file mode 100644 index 820e53fc4bd..00000000000 --- a/devel/glib2/patches/patch-gmodule_gmodule-ar.c +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-gmodule_gmodule-ar.c,v 1.1 2018/10/08 10:12:06 prlw1 Exp $ - -https://gitlab.gnome.org/GNOME/glib/issues/19 - ---- gmodule/gmodule-ar.c.orig 2017-07-13 23:03:39.000000000 +0000 -+++ gmodule/gmodule-ar.c -@@ -141,19 +141,10 @@ _g_module_self (void) - } - - static void --_g_module_close (gpointer handle, -- gboolean is_unref) -+_g_module_close (gpointer handle) - { -- /* are there any systems out there that have dlopen()/dlclose() -- * without a reference count implementation? -- */ -- is_unref |= 1; -- -- if (is_unref) -- { -- if (dlclose (handle) != 0) -- g_module_set_error (fetch_dlerror (TRUE)); -- } -+ if (dlclose (handle) != 0) -+ g_module_set_error (fetch_dlerror (TRUE)); - } - - static gpointer diff --git a/devel/glib2/patches/patch-gmodule_gmodule-dl.c b/devel/glib2/patches/patch-gmodule_gmodule-dl.c deleted file mode 100644 index 192f3739179..00000000000 --- a/devel/glib2/patches/patch-gmodule_gmodule-dl.c +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-gmodule_gmodule-dl.c,v 1.1 2018/10/08 10:12:06 prlw1 Exp $ - -RTLD_GLOBAL is a bug. -https://gitlab.gnome.org/GNOME/glib/issues/19 - ---- gmodule/gmodule-dl.c.orig 2018-01-08 21:34:19.000000000 +0000 -+++ gmodule/gmodule-dl.c -@@ -106,46 +106,13 @@ _g_module_open (const gchar *file_name, - static gpointer - _g_module_self (void) - { -- gpointer handle; -- -- /* to query symbols from the program itself, special link options -- * are required on some systems. -- */ -- -- /* On Android 32 bit (i.e. not __LP64__), dlopen(NULL) -- * does not work reliable and generally no symbols are found -- * at all. RTLD_DEFAULT works though. -- * On Android 64 bit, dlopen(NULL) seems to work but dlsym(handle) -- * always returns 'undefined symbol'. Only if RTLD_DEFAULT or -- * NULL is given, dlsym returns an appropriate pointer. -- */ --#if defined(__BIONIC__) -- handle = RTLD_DEFAULT; --#else -- handle = dlopen (NULL, RTLD_GLOBAL | RTLD_LAZY); --#endif -- if (!handle) -- g_module_set_error (fetch_dlerror (TRUE)); -- -- return handle; -+ return RTLD_DEFAULT; - } - - static void --_g_module_close (gpointer handle, -- gboolean is_unref) -+_g_module_close (gpointer handle) - { -- /* are there any systems out there that have dlopen()/dlclose() -- * without a reference count implementation? -- * -- * See above for the Android special case -- */ --#if defined(__BIONIC__) -- is_unref = (handle != RTLD_DEFAULT); --#else -- is_unref |= 1; --#endif -- -- if (is_unref) -+ if (handle != RTLD_DEFAULT) - { - if (dlclose (handle) != 0) - g_module_set_error (fetch_dlerror (TRUE)); diff --git a/devel/glib2/patches/patch-gmodule_gmodule-dyld.c b/devel/glib2/patches/patch-gmodule_gmodule-dyld.c deleted file mode 100644 index d2bc967419a..00000000000 --- a/devel/glib2/patches/patch-gmodule_gmodule-dyld.c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-gmodule_gmodule-dyld.c,v 1.1 2018/10/08 10:12:06 prlw1 Exp $ - -http://bugzilla.gnome.org/show_bug.cgi?id=107626 -https://gitlab.gnome.org/GNOME/glib/issues/19 - ---- gmodule/gmodule-dyld.c.orig 2018-09-14 11:18:09.527026838 +0000 -+++ gmodule/gmodule-dyld.c -@@ -96,8 +96,7 @@ _g_module_self (void) - } - - static void --_g_module_close (gpointer handle, -- gboolean is_unref) -+_g_module_close (gpointer handle) - { - if (handle == &self_module) - return; -@@ -118,7 +117,13 @@ _g_module_symbol (gpointer handle, - if (NSIsSymbolNameDefined (symbol_name)) - sym = NSLookupAndBindSymbol (symbol_name); - else -- sym = NULL; -+ { -+ GModule *mod; -+ for (mod = modules, sym = NULL; mod && !sym; mod = mod->next) -+ { -+ sym = NSLookupSymbolInModule (mod->handle, symbol_name); -+ } -+ } - } - else - sym = NSLookupSymbolInModule (handle, symbol_name); diff --git a/devel/glib2/patches/patch-gmodule_gmodule-win32.c b/devel/glib2/patches/patch-gmodule_gmodule-win32.c deleted file mode 100644 index bd3a6c852b2..00000000000 --- a/devel/glib2/patches/patch-gmodule_gmodule-win32.c +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-gmodule_gmodule-win32.c,v 1.1 2018/10/08 10:12:06 prlw1 Exp $ - -https://gitlab.gnome.org/GNOME/glib/issues/19 - ---- gmodule/gmodule-win32.c.orig 2018-01-08 21:34:19.000000000 +0000 -+++ gmodule/gmodule-win32.c -@@ -105,8 +105,7 @@ _g_module_self (void) - } - - static void --_g_module_close (gpointer handle, -- gboolean is_unref) -+_g_module_close (gpointer handle) - { - if (handle != null_module_handle) - if (!FreeLibrary (handle)) diff --git a/devel/glib2/patches/patch-gmodule_gmodule.c b/devel/glib2/patches/patch-gmodule_gmodule.c deleted file mode 100644 index 67e4a3d85bc..00000000000 --- a/devel/glib2/patches/patch-gmodule_gmodule.c +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-gmodule_gmodule.c,v 1.1 2018/10/08 10:12:06 prlw1 Exp $ - -RTLD_GLOBAL is a bug. -https://gitlab.gnome.org/GNOME/glib/issues/19 - ---- gmodule/gmodule.c.orig 2018-01-08 21:34:19.000000000 +0000 -+++ gmodule/gmodule.c -@@ -207,8 +207,7 @@ struct _GModule - static gpointer _g_module_open (const gchar *file_name, - gboolean bind_lazy, - gboolean bind_local); --static void _g_module_close (gpointer handle, -- gboolean is_unref); -+static void _g_module_close (gpointer handle); - static gpointer _g_module_self (void); - static gpointer _g_module_symbol (gpointer handle, - const gchar *symbol_name); -@@ -299,8 +298,7 @@ _g_module_open (const gchar *file_name, - return NULL; - } - static void --_g_module_close (gpointer handle, -- gboolean is_unref) -+_g_module_close (gpointer handle) - { - } - static gpointer -@@ -510,9 +508,8 @@ g_module_open (const gchar *file_name - if (!main_module) - { - handle = _g_module_self (); --/* On Android 64 bit, RTLD_DEFAULT is (void *)0x0 -- * so it always fails to create main_module if file_name is NULL */ --#if !defined(__BIONIC__) || !defined(__LP64__) -+/* On Linux, handle == RTLD_DEFAULT is (void *)0x0 */ -+#if G_MODULE_IMPL != G_MODULE_IMPL_DL - if (handle) - #endif - { -@@ -617,7 +614,7 @@ g_module_open (const gchar *file_name - module = g_module_find_by_handle (handle); - if (module) - { -- _g_module_close (module->handle, TRUE); -+ _g_module_close (module->handle); - module->ref_count++; - g_module_set_error (NULL); - -@@ -723,7 +720,7 @@ g_module_close (GModule *module) - } - module->next = NULL; - -- _g_module_close (module->handle, FALSE); -+ _g_module_close (module->handle); - g_free (module->file_name); - g_free (module); - } diff --git a/devel/glib2/patches/patch-meson.build b/devel/glib2/patches/patch-meson.build index 4db002df9d8..31ccf0e27be 100644 --- a/devel/glib2/patches/patch-meson.build +++ b/devel/glib2/patches/patch-meson.build @@ -1,4 +1,4 @@ -$NetBSD: patch-meson.build,v 1.9 2020/02/07 17:05:14 prlw1 Exp $ +$NetBSD: patch-meson.build,v 1.10 2020/03/04 15:11:48 wiz Exp $ - On Darwin, optionally use Cocoa (needed for X11 users). @@ -17,17 +17,9 @@ $NetBSD: patch-meson.build,v 1.9 2020/02/07 17:05:14 prlw1 Exp $ glib bug #1777 c.f., PR pkg/54909 and PR pkg/54298 ---- meson.build.orig 2020-02-07 11:23:09.221446856 +0000 +--- meson.build.orig 2020-02-27 16:12:52.000000000 +0000 +++ meson.build -@@ -5,7 +5,6 @@ project('glib', 'c', 'cpp', - default_options : [ - 'buildtype=debugoptimized', - 'warning_level=1', -- 'c_std=gnu89' - ] - ) - -@@ -671,6 +670,7 @@ if host_system == 'darwin' +@@ -677,6 +677,7 @@ if host_system == 'darwin' #error "Detected GNUstep, not Cocoa" #endif''', name : 'Mac OS X Cocoa support') @@ -35,98 +27,7 @@ $NetBSD: patch-meson.build,v 1.9 2020/02/07 17:05:14 prlw1 Exp $ if glib_have_cocoa glib_conf.set('HAVE_COCOA', true) -@@ -1314,28 +1314,86 @@ else - glibconfig_conf.set('g_searchpath_separator', ':') - endif - --if sizet_size == short_size -+g_sizet_compatibility = { -+ 'short': sizet_size == short_size, -+ 'int': sizet_size == int_size, -+ 'long': sizet_size == long_size, -+ 'long long': sizet_size == long_long_size, -+} -+ -+# Do separate checks for gcc/clang (and ignore other compilers for now), since -+# we need to explicitly pass -Werror to the compilers. -+# FIXME: https://github.com/mesonbuild/meson/issues/5399 -+# We can’t simplify these checks using a foreach loop because dictionary keys -+# have to be string literals. -+# FIXME: https://github.com/mesonbuild/meson/issues/5231 -+if cc.get_id() == 'gcc' or cc.get_id() == 'clang' -+ g_sizet_compatibility += { -+ 'short': g_sizet_compatibility['short'] and cc.compiles( -+ '''#include <stddef.h> -+ size_t f (size_t *i) { return *i + 1; } -+ int main (void) { -+ unsigned short i = 0; -+ f (&i); -+ return 0; -+ }''', -+ args: ['-Werror'], -+ name : 'GCC size_t typedef is short'), -+ 'int': g_sizet_compatibility['int'] and cc.compiles( -+ '''#include <stddef.h> -+ size_t f (size_t *i) { return *i + 1; } -+ int main (void) { -+ unsigned int i = 0; -+ f (&i); -+ return 0; -+ }''', -+ args: ['-Werror'], -+ name : 'GCC size_t typedef is int'), -+ 'long': g_sizet_compatibility['long'] and cc.compiles( -+ '''#include <stddef.h> -+ size_t f (size_t *i) { return *i + 1; } -+ int main (void) { -+ unsigned long i = 0; -+ f (&i); -+ return 0; -+ }''', -+ args: ['-Werror'], -+ name : 'GCC size_t typedef is long'), -+ 'long long': g_sizet_compatibility['long long'] and cc.compiles( -+ '''#include <stddef.h> -+ size_t f (size_t *i) { return *i + 1; } -+ int main (void) { -+ unsigned long long i = 0; -+ f (&i); -+ return 0; -+ }''', -+ args: ['-Werror'], -+ name : 'GCC size_t typedef is long long'), -+ } -+endif -+ -+if g_sizet_compatibility['short'] - glibconfig_conf.set('glib_size_type_define', 'short') - glibconfig_conf.set_quoted('gsize_modifier', 'h') - glibconfig_conf.set_quoted('gssize_modifier', 'h') - glibconfig_conf.set_quoted('gsize_format', 'hu') - glibconfig_conf.set_quoted('gssize_format', 'hi') - glibconfig_conf.set('glib_msize_type', 'SHRT') --elif sizet_size == int_size -+elif g_sizet_compatibility['int'] - glibconfig_conf.set('glib_size_type_define', 'int') - glibconfig_conf.set_quoted('gsize_modifier', '') - glibconfig_conf.set_quoted('gssize_modifier', '') - glibconfig_conf.set_quoted('gsize_format', 'u') - glibconfig_conf.set_quoted('gssize_format', 'i') - glibconfig_conf.set('glib_msize_type', 'INT') --elif sizet_size == long_size -+elif g_sizet_compatibility['long'] - glibconfig_conf.set('glib_size_type_define', 'long') - glibconfig_conf.set_quoted('gsize_modifier', 'l') - glibconfig_conf.set_quoted('gssize_modifier', 'l') - glibconfig_conf.set_quoted('gsize_format', 'lu') - glibconfig_conf.set_quoted('gssize_format', 'li') - glibconfig_conf.set('glib_msize_type', 'LONG') --elif sizet_size == long_long_size -+elif g_sizet_compatibility['long long'] - glibconfig_conf.set('glib_size_type_define', 'long long') - glibconfig_conf.set_quoted('gsize_modifier', int64_m) - glibconfig_conf.set_quoted('gssize_modifier', int64_m) -@@ -1832,7 +1890,7 @@ endif +@@ -1904,7 +1905,7 @@ endif # proxy-libintl subproject. # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. @@ -135,7 +36,7 @@ $NetBSD: patch-meson.build,v 1.9 2020/02/07 17:05:14 prlw1 Exp $ libintl = [] have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset') else -@@ -1883,16 +1941,15 @@ if host_system != 'windows' and get_opti +@@ -1955,16 +1956,15 @@ if host_system != 'windows' and get_opti if cc.has_function('getxattr') and cc.has_header('sys/xattr.h') glib_conf.set('HAVE_SYS_XATTR_H', 1) glib_conf_prefix = glib_conf_prefix + '#define @0@ 1\n'.format('HAVE_SYS_XATTR_H') @@ -154,7 +55,7 @@ $NetBSD: patch-meson.build,v 1.9 2020/02/07 17:05:14 prlw1 Exp $ if cc.compiles(glib_conf_prefix + ''' #include <stdio.h> #ifdef HAVE_SYS_TYPES_H -@@ -1986,9 +2043,11 @@ endif +@@ -2058,9 +2058,11 @@ endif glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline) @@ -168,8 +69,8 @@ $NetBSD: patch-meson.build,v 1.9 2020/02/07 17:05:14 prlw1 Exp $ +python_name = python.path() python_version = python.language_version() - python_version_req = '>=3.4' -@@ -1997,7 +2056,7 @@ if not python_version.version_compare(py + python_version_req = '>=3.5' +@@ -2069,7 +2071,7 @@ if not python_version.version_compare(py endif # Determine which user environment-dependent files that we want to install @@ -178,7 +79,7 @@ $NetBSD: patch-meson.build,v 1.9 2020/02/07 17:05:14 prlw1 Exp $ have_sh = find_program('sh', required : false).found() # For glib-gettextize # Some installed tests require a custom environment -@@ -2005,8 +2064,7 @@ env_program = find_program('env', requir +@@ -2077,8 +2079,7 @@ env_program = find_program('env', requir # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578 if host_system == 'sunos' |