CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 23 Nov 2022 10:41:41 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov 23 10:41:41 UTC 2022

Modified Files:
        pkgsrc/devel/gdbus-codegen: distinfo
        pkgsrc/devel/glib2: Makefile Makefile.common PLIST buildlink3.mk
            distinfo options.mk
        pkgsrc/devel/glib2/patches: patch-gio_gdbus-2.0_codegen_meson.build
            patch-glib_meson.build patch-glib_tests_meson.build
            patch-gobject_meson.build patch-meson.build

Log Message:
glib2 glib2-tools gdbus-codegen: updated to 2.74.1

Overview of changes in GLib 2.74.1
==================================

* Update Unicode data to version 15 (work by Marco Trevisan)

* Fix various build failures in different situations
  (work by Kjell Ahlstedt, Marco Trevisan (TreviĂąo))

* Fix over-eager deprecated property warnings for construct properties
  (work by Simon McVittie)

* Fix a crash calling `g_param_value_is_valid()` on a `GParamSpecParam` (work by
  Emmanuele Bassi)

* Fix floating `GVariant` leaks with GObject properties (work by Matthias Clasen)

* Add inline optimised version of `g_str_equal()` (work by Xavier Claessens)

* Fix `GVariant` type depths checks on text format variants (work by Philip Withnall)

* Fix regression with int64 and double hashing functions on big-endian architectures
  (work by Simon McVittie)

* Build the API documentation only when building GLib as a shared library (work
  by Emmanuele Bassi)

* Ignore weird `/etc/localtime` configurations generated by toolbx (work by Ray Strode)

* Avoid `EINTR` races when closing FDs in `g_spawn_*()` (work by Thomas Haller)

* Bugs fixed.

Overview of changes in GLib 2.74.0, 17-09-2022
==============================================

* Use EPOLL_CLOEXEC by default (Colin Walters)

* Fixed various regression on GRegex as per the PCRE2 porting (Marco Trevisan)

* Fixed various memory leaks (Sebastian Keller, Marco Trevisan)

* Bugs fixed:
 - GNOME/gtksourceview-278 Failed to load html.lang after GLib switched to PCRE2
   (Marco Trevisan (TreviĂąo))
 - GNOME/gtksourceview-283 GRegex-on-PCRE2 regressions (Marco Trevisan)
 - -2688 Follow-up from "replace pcre1 with pcre2" (Marco Trevisan (TreviĂąo))
 - -2713 static_assert is undefined in C99 (wen Rafferty)
 - -2719 GParamSpec constructors should have nullable annotation on nick/blurb
   (Andy Holmes)
 - -2729 GRegex/GMatchInfo related crashes after upgrade to 2.73.2 (Marco
   Trevisan)
 - -2733 gio: GVariantBuilder builder leaked in g_document_portal_add_documents
   when URI list is empty (Sebastian Keller)
 - -2737 gio mount coredumps on prompt exit since 2.73 (Marco Trevisan)
 - -2741 Memory errors on GRegex (Marco Trevisan (TreviĂąo))
 - GNOME/gtk-4400 gtk_show_uri can't open browser on MSYS2 on Windows (Luca
   Bacci)
 - !2820 ci: Expose the coverage report and docs as links in the MR's (Marco)
 - !2855 gtlscertificate: Update reference to G_TLS_CERTIFICATE_NO_FLAGS
 - !2861 mem: Document OOM behavior for allocations (Matthias Clasen)
 - !2868 gio-unix: Use EPOLL_CLOEXEC by default (Colin Walters)
 - !2873 Fix array-bounds compiler warnings with GCC 12 (Emmanuele Bassi)
 - !2874 tests, GDesktopAppInfo: Fix various GVariant leaks (Marco Trevisan)
 - !2875 g_strsplit: Use a pre-allocated GArray when max_tokens is provided
   (Marco Trevisan)
 - !2876 GActionGroup: Fix ownership transfer annotation for query_action()
   (Andy Holmes)
 - !2879 gioenumtypes: Only define GLIB_DISABLE_DEPRECATION_WARNINGS if needed
   (Marco Trevisan)
 - !2881 GWin32AppInfo: Add missing g_spawn_close_pid (Luca Bacci)
 - !2882 meson: Set install_tag on all tools (Xavier Claessens)
 - !2883 ci: Improve style check script (Matthias Clasen)
 - !2900 docs: Improve wording in documentation of g_unix_signal_source_new()
   (Tom Levy)


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/gdbus-codegen/distinfo
cvs rdiff -u -r1.290 -r1.291 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.141 -r1.142 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/glib2/buildlink3.mk
cvs rdiff -u -r1.302 -r1.303 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/glib2/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build \
    pkgsrc/devel/glib2/patches/patch-glib_tests_meson.build
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/glib2/patches/patch-glib_meson.build
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/glib2/patches/patch-gobject_meson.build
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/glib2/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/devel/gdbus-codegen/distinfo
diff -u pkgsrc/devel/gdbus-codegen/distinfo:1.35 pkgsrc/devel/gdbus-codegen/distinfo:1.36
--- pkgsrc/devel/gdbus-codegen/distinfo:1.35    Thu Oct  6 13:34:07 2022
+++ pkgsrc/devel/gdbus-codegen/distinfo Wed Nov 23 10:41:41 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.35 2022/10/06 13:34:07 adam Exp $
+$NetBSD: distinfo,v 1.36 2022/11/23 10:41:41 adam Exp $
 
-BLAKE2s (glib-2.72.4.tar.xz) = ecf80fff14a59f32a2c3f8550bb73023f39ed7f1bdc2c939a57582f6fb1d8d67
-SHA512 (glib-2.72.4.tar.xz) = b4e2e0985e2184ee9656c4f1b4e15d8d1264f3d23d31349bc43d92e8432cffa48e1685c40517efb08dc5b57b8285acf65f2747deeb50e50d9cacec7160e7edf8
-Size (glib-2.72.4.tar.xz) = 4884256 bytes
+BLAKE2s (glib-2.74.1.tar.xz) = 40ac91d2561235c40852aad8bef00c0a7e76939b25018cb6ab1e86efd87617bf
+SHA512 (glib-2.74.1.tar.xz) = 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
+Size (glib-2.74.1.tar.xz) = 5189452 bytes
 SHA1 (patch-meson.build) = 4f9d178950414e1537b48a552d63c9e551801999

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.290 pkgsrc/devel/glib2/Makefile:1.291
--- pkgsrc/devel/glib2/Makefile:1.290   Tue Aug  9 12:08:28 2022
+++ pkgsrc/devel/glib2/Makefile Wed Nov 23 10:41:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.290 2022/08/09 12:08:28 jperkin Exp $
+# $NetBSD: Makefile,v 1.291 2022/11/23 10:41:41 adam Exp $
 
 .include "Makefile.common"
 
@@ -24,7 +24,7 @@ LDFLAGS.SunOS+=               -lnsl -lsocket
 LDFLAGS.FreeBSD+=      -liconv
 
 .include "../../mk/bsd.prefs.mk"
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
+.if ${USE_CROSS_COMPILE:U:tl} == yes
 MESON_CROSS_ARCH_VARS+=                        growing_stack
 MESON_CROSS_OPSYS_VARS+=               have_c99_snprintf
 MESON_CROSS_OPSYS_VARS+=               have_c99_vsnprintf
@@ -85,9 +85,9 @@ post-extract:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/meson/build.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/tool.mk"

Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.103 pkgsrc/devel/glib2/Makefile.common:1.104
--- pkgsrc/devel/glib2/Makefile.common:1.103    Thu Oct  6 13:34:07 2022
+++ pkgsrc/devel/glib2/Makefile.common  Wed Nov 23 10:41:41 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.103 2022/10/06 13:34:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.104 2022/11/23 10:41:41 adam Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=      glib-2.72.4
+DISTNAME=      glib-2.74.1
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.141 pkgsrc/devel/glib2/PLIST:1.142
--- pkgsrc/devel/glib2/PLIST:1.141      Thu Oct  6 13:34:07 2022
+++ pkgsrc/devel/glib2/PLIST    Wed Nov 23 10:41:41 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.141 2022/10/06 13:34:07 adam Exp $
+@comment $NetBSD: PLIST,v 1.142 2022/11/23 10:41:41 adam Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gio
@@ -11,7 +11,6 @@ bin/gresource
 bin/gsettings
 ${PLIST.nococoa}include/gio-unix-2.0/gio/gdesktopappinfo.h
 include/gio-unix-2.0/gio/gfiledescriptorbased.h
-include/gio-unix-2.0/gio/gunixfdlist.h
 include/gio-unix-2.0/gio/gunixfdmessage.h
 include/gio-unix-2.0/gio/gunixinputstream.h
 include/gio-unix-2.0/gio/gunixmounts.h
@@ -167,6 +166,7 @@ include/glib-2.0/gio/gtlspassword.h
 include/glib-2.0/gio/gtlsserverconnection.h
 include/glib-2.0/gio/gunixconnection.h
 include/glib-2.0/gio/gunixcredentialsmessage.h
+include/glib-2.0/gio/gunixfdlist.h
 include/glib-2.0/gio/gunixsocketaddress.h
 include/glib-2.0/gio/gvfs.h
 include/glib-2.0/gio/gvolume.h
@@ -289,19 +289,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.7200.4
+lib/libgio-2.0.so.0.7400.1
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.7200.4
+lib/libglib-2.0.so.0.7400.1
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.7200.4
+lib/libgmodule-2.0.so.0.7400.1
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.7200.4
+lib/libgobject-2.0.so.0.7400.1
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.7200.4
+lib/libgthread-2.0.so.0.7400.1
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/glib-2.0.pc
@@ -310,11 +310,12 @@ 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
+${PLIST.nococoa}libexec/gio-launch-desktop
 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.7200.4-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7200.4-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.7400.1-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.7400.1-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/gdb/glib_gdb.py
@@ -322,6 +323,7 @@ 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/locale/ab/LC_MESSAGES/glib20.mo
 share/locale/af/LC_MESSAGES/glib20.mo
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/an/LC_MESSAGES/glib20.mo

Index: pkgsrc/devel/glib2/buildlink3.mk
diff -u pkgsrc/devel/glib2/buildlink3.mk:1.32 pkgsrc/devel/glib2/buildlink3.mk:1.33
--- pkgsrc/devel/glib2/buildlink3.mk:1.32       Wed Dec  8 16:01:52 2021
+++ pkgsrc/devel/glib2/buildlink3.mk    Wed Nov 23 10:41:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2021/12/08 16:01:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2022/11/23 10:41:41 adam Exp $
 
 BUILDLINK_TREE+=       glib2
 
@@ -16,9 +16,9 @@ TOOL_DEPENDS+=        glib2-tools-[0-9]*:../../
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GLIB2_BUILDLINK3_MK
 

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.302 pkgsrc/devel/glib2/distinfo:1.303
--- pkgsrc/devel/glib2/distinfo:1.302   Thu Oct  6 13:34:07 2022
+++ pkgsrc/devel/glib2/distinfo Wed Nov 23 10:41:41 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.302 2022/10/06 13:34:07 adam Exp $
+$NetBSD: distinfo,v 1.303 2022/11/23 10:41:41 adam Exp $
 
-BLAKE2s (glib-2.72.4.tar.xz) = ecf80fff14a59f32a2c3f8550bb73023f39ed7f1bdc2c939a57582f6fb1d8d67
-SHA512 (glib-2.72.4.tar.xz) = b4e2e0985e2184ee9656c4f1b4e15d8d1264f3d23d31349bc43d92e8432cffa48e1685c40517efb08dc5b57b8285acf65f2747deeb50e50d9cacec7160e7edf8
-Size (glib-2.72.4.tar.xz) = 4884256 bytes
+BLAKE2s (glib-2.74.1.tar.xz) = 40ac91d2561235c40852aad8bef00c0a7e76939b25018cb6ab1e86efd87617bf
+SHA512 (glib-2.74.1.tar.xz) = 21176cb95fcab49a781d02789bf21191a96a34a6391f066699b3c20b414b3169c958bd86623deb34ca55912083862885f7a7d12b67cc041467da2ba94d9e83c3
+Size (glib-2.74.1.tar.xz) = 5189452 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
-SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
+SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 76ed9658ac11fb33b97143938b6a60b5aa515cae
 SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac
 SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
@@ -17,13 +17,13 @@ SHA1 (patch-glib_gatomic.c) = deb2e74010
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
 SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
-SHA1 (patch-glib_meson.build) = 666a4dba0ad53acdf952946056b7a84bf5fdcf1e
+SHA1 (patch-glib_meson.build) = f1685d64dea7939e1b112c362fc05e849c870711
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
 SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
-SHA1 (patch-glib_tests_meson.build) = d358bd579eb09655c608106092bdeed8f16ff4d0
+SHA1 (patch-glib_tests_meson.build) = 6af78a11f13f3c765ed0d9a9aad88daa7c124752
 SHA1 (patch-gmodule_gmodule-dl.c) = 13a6e81adc1b54ab0ed8d6302ee063754cd6f881
 SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
-SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
-SHA1 (patch-meson.build) = a901c4443df1600e9a81504229b4df67229a9cd0
+SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
+SHA1 (patch-meson.build) = 18fb6ac870718e9950cb2f1a20ad23b6b6475463
 SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54

Index: pkgsrc/devel/glib2/options.mk
diff -u pkgsrc/devel/glib2/options.mk:1.22 pkgsrc/devel/glib2/options.mk:1.23
--- pkgsrc/devel/glib2/options.mk:1.22  Tue Oct 29 09:22:24 2019
+++ pkgsrc/devel/glib2/options.mk       Wed Nov 23 10:41:41 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2019/10/29 09:22:24 adam Exp $
+# $NetBSD: options.mk,v 1.23 2022/11/23 10:41:41 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.glib2
 PKG_SUPPORTED_OPTIONS= fam
@@ -15,6 +15,9 @@ PLIST_VARS+=  cocoa nococoa
 # if this options is enabled, use quartz for gtk{2,3}
 .if !empty(PKG_OPTIONS:Mcocoa)
 MESON_ARGS+=   -Duse_cocoa=true
+# Broken as of 2.74.1: gio/tests/giotypefuncs.inc:168:9:
+# error: implicit declaration of function 'g_osx_app_info_get_type'
+MESON_ARGS+=   -Dtests=false
 PLIST.cocoa=   yes
 .else
 PLIST.nococoa= yes

Index: pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build:1.2 pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build:1.3
--- pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build:1.2      Thu Nov 14 11:40:30 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_gdbus-2.0_codegen_meson.build  Wed Nov 23 10:41:41 2022
@@ -1,29 +1,30 @@
-$NetBSD: patch-gio_gdbus-2.0_codegen_meson.build,v 1.2 2019/11/14 11:40:30 wiz Exp $
+$NetBSD: patch-gio_gdbus-2.0_codegen_meson.build,v 1.3 2022/11/23 10:41:41 adam Exp $
 
 Leave gdbus-2.0/codegen sudirectory to devel/gdbus-codegen package.
 
---- gio/gdbus-2.0/codegen/meson.build.orig     2019-10-04 11:44:23.000000000 +0000
+--- gio/gdbus-2.0/codegen/meson.build.orig     2022-10-25 12:53:22.000000000 +0000
 +++ gio/gdbus-2.0/codegen/meson.build
-@@ -17,6 +17,7 @@ gdbus_codegen_conf.set('DATADIR', glib_d
+@@ -20,6 +20,7 @@ gdbus_codegen_conf.set('DATADIR', glib_d
  gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
    output : 'gdbus-codegen',
    install_dir : get_option('bindir'),
 +  install : false,
+   install_tag : 'bin-devel',
    configuration : gdbus_codegen_conf
  )
-   # Provide tools for others when we're a subproject and they use the Meson GNOME module
-@@ -28,6 +29,7 @@ gdbus_codegen_built_files = []
+@@ -32,6 +33,7 @@ gdbus_codegen_built_files = []
  gdbus_codegen_built_files += configure_file(input : 'config.py.in',
                                              output : 'config.py',
                                              install_dir : codegen_dir,
 +                                            install : false,
+                                             install_tag : 'bin-devel',
                                              configuration : gdbus_codegen_conf)
  
- foreach f : gdbus_codegen_files
-@@ -35,5 +37,6 @@ foreach f : gdbus_codegen_files
+@@ -40,6 +42,7 @@ foreach f : gdbus_codegen_files
    # and then install it too so that it can be used after installation
    gdbus_codegen_built_files += configure_file(input : f, output : f,
                                                install_dir : codegen_dir,
 +                                              install : false,
+                                               install_tag : 'bin-devel',
                                                copy : true)
  endforeach
Index: pkgsrc/devel/glib2/patches/patch-glib_tests_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-glib_tests_meson.build:1.2 pkgsrc/devel/glib2/patches/patch-glib_tests_meson.build:1.3
--- pkgsrc/devel/glib2/patches/patch-glib_tests_meson.build:1.2 Wed Mar 31 10:11:23 2021
+++ pkgsrc/devel/glib2/patches/patch-glib_tests_meson.build     Wed Nov 23 10:41:41 2022
@@ -1,15 +1,15 @@
-$NetBSD: patch-glib_tests_meson.build,v 1.2 2021/03/31 10:11:23 wiz Exp $
+$NetBSD: patch-glib_tests_meson.build,v 1.3 2022/11/23 10:41:41 adam Exp $
 
-* Fix gtester is not defined error during configure.
+Fix gtester is not defined error during configure.
 
---- glib/tests/meson.build.orig        2021-03-18 13:28:31.953625200 +0000
+--- glib/tests/meson.build.orig        2022-11-23 08:44:11.000000000 +0000
 +++ glib/tests/meson.build
-@@ -269,21 +269,4 @@ executable('testing-helper', 'testing-he
+@@ -410,21 +410,5 @@ executable('testing-helper', 'testing-he
    install: installed_tests_enabled,
  )
  
 -# some testing of gtester functionality
--if not meson.is_cross_build() and host_system != 'windows'
+-if meson.can_run_host_binaries() and host_system != 'windows'
 -  xmllint = find_program('xmllint', required: false)
 -  if xmllint.found()
 -    tmpsample_xml = custom_target('tmpsample.xml',
@@ -24,5 +24,5 @@ $NetBSD: patch-glib_tests_meson.build,v 
 -    )
 -  endif
 -endif
--
+ 
  subdir('path-test-subdir')

Index: pkgsrc/devel/glib2/patches/patch-glib_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.10 pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.11
--- pkgsrc/devel/glib2/patches/patch-glib_meson.build:1.10      Sun Jul 24 21:24:56 2022
+++ pkgsrc/devel/glib2/patches/patch-glib_meson.build   Wed Nov 23 10:41:41 2022
@@ -1,17 +1,18 @@
-$NetBSD: patch-glib_meson.build,v 1.10 2022/07/24 21:24:56 wiz Exp $
+$NetBSD: patch-glib_meson.build,v 1.11 2022/11/23 10:41:41 adam Exp $
 
 - Don't bother with gtester as it's slated for deprecation anyway:
   https://gitlab.gnome.org/GNOME/glib/issues/1441
 
---- glib/meson.build.orig      2022-05-30 13:26:47.000000000 +0000
+--- glib/meson.build.orig      2022-10-25 12:53:22.000000000 +0000
 +++ glib/meson.build
-@@ -431,25 +431,8 @@ if host_system == 'windows'
+@@ -433,26 +433,8 @@ if host_system == 'windows'
        include_directories : configinc,
        dependencies : [libglib_dep])
    endif
 -else
 -  gtester = executable('gtester', 'gtester.c',
 -    install : true,
+-    install_tag : 'bin-devel',
 -    c_args : ['-UG_DISABLE_ASSERT'],
 -    include_directories : configinc,
 -    dependencies : [libglib_dep])
@@ -24,10 +25,10 @@ $NetBSD: patch-glib_meson.build,v 1.10 2
 -  input: 'gtester-report.in',
 -  output: 'gtester-report',
 -  install_dir: get_option('bindir'),
+-  install_tag : 'bin-devel',
 -  configuration: report_conf,
 -  install_mode: 'rwxr-xr-x'
 -)
--
- install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
  
- # This is needed to make gdb find glib_gdb.py
+ install_data('glib_gdb.py',
+   install_dir : glib_pkgdatadir / 'gdb',

Index: pkgsrc/devel/glib2/patches/patch-gobject_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gobject_meson.build:1.5 pkgsrc/devel/glib2/patches/patch-gobject_meson.build:1.6
--- pkgsrc/devel/glib2/patches/patch-gobject_meson.build:1.5    Thu Nov 14 11:40:30 2019
+++ pkgsrc/devel/glib2/patches/patch-gobject_meson.build        Wed Nov 23 10:41:41 2022
@@ -1,14 +1,14 @@
-$NetBSD: patch-gobject_meson.build,v 1.5 2019/11/14 11:40:30 wiz Exp $
+$NetBSD: patch-gobject_meson.build,v 1.6 2022/11/23 10:41:41 adam Exp $
 
 Leave glib-genmarshal and glib-mkenums to devel/glib2-tools.
 
---- gobject/meson.build.orig   2019-10-04 11:44:24.000000000 +0000
+--- gobject/meson.build.orig   2022-10-25 12:53:22.000000000 +0000
 +++ gobject/meson.build
-@@ -75,6 +75,7 @@ foreach tool: python_tools
+@@ -79,6 +79,7 @@ foreach tool: python_tools
      input : tool + '.in',
      output : tool,
      configuration : python_tools_conf,
 +    install : false,
      install_dir : glib_bindir,
+     install_tag : 'bin-devel',
    )
- 

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.17 pkgsrc/devel/glib2/patches/patch-meson.build:1.18
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.17   Sun Jul 24 21:24:56 2022
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Wed Nov 23 10:41:41 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.17 2022/07/24 21:24:56 wiz Exp $
+$NetBSD: patch-meson.build,v 1.18 2022/11/23 10:41:41 adam Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -12,9 +12,9 @@ $NetBSD: patch-meson.build,v 1.17 2022/0
 
 - Define a newer POSIX, as we build this package with -std=gnu99
 
---- meson.build.orig   2022-05-30 13:26:47.000000000 +0000
+--- meson.build.orig   2022-10-25 12:53:22.000000000 +0000
 +++ meson.build
-@@ -821,7 +821,7 @@ if host_system == 'darwin'
+@@ -874,7 +874,7 @@ if host_system == 'darwin'
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -23,7 +23,7 @@ $NetBSD: patch-meson.build,v 1.17 2022/0
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
    endif
-@@ -2159,18 +2159,17 @@ if host_system != 'windows' and get_opti
+@@ -2167,18 +2167,17 @@ if host_system != 'windows' and get_opti
  
    # try glibc
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
@@ -44,23 +44,16 @@ $NetBSD: patch-meson.build,v 1.17 2022/0
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2271,9 +2270,12 @@ endif
+@@ -2281,7 +2280,7 @@ glib_conf.set('HAVE_PROC_SELF_CMDLINE', 
  
- glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
- 
--python = import('python').find_installation('python3')
--# used for '#!/usr/bin/env <name>'
+ python = import('python').find_installation()
+ # used for '#!/usr/bin/env <name>'
 -python_name = 'python3'
-+python = import('python').find_installation('python3', required: false)
-+if not python.found()
-+  python = import('python').find_installation()
-+endif
 +python_name = python.path()
-+
  
  python_version = python.language_version()
  python_version_req = '>=3.5'
-@@ -2282,7 +2284,7 @@ if not python_version.version_compare(py
+@@ -2290,7 +2289,7 @@ if not python_version.version_compare(py
  endif
  
  # Determine which user environment-dependent files that we want to install
@@ -69,7 +62,7 @@ $NetBSD: patch-meson.build,v 1.17 2022/0
  bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
  have_sh = find_program('sh', required : false).found() # For glib-gettextize
  
-@@ -2291,8 +2293,7 @@ env_program = find_program('env', requir
+@@ -2299,8 +2298,7 @@ env_program = find_program('env', requir
  
  # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
  if host_system == 'sunos'

Prev by Date: CVS commit: pkgsrc/mk/pbulk
Next by Date: CVS commit: pkgsrc/textproc/icu
Previous by Thread: CVS commit: pkgsrc/mk/pbulk
Next by Thread: CVS commit: pkgsrc/textproc/icu
Indexes:

Home | Main Index | Thread Index | Old Index