CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 22 Oct 2024 09:50:39 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Oct 22 09:50:39 UTC 2024

Modified Files:
        pkgsrc/devel/gdbus-codegen: Makefile distinfo
        pkgsrc/devel/gdbus-codegen/patches: patch-meson.build
        pkgsrc/devel/glib2: Makefile Makefile.common PLIST distinfo
        pkgsrc/devel/glib2-tools: Makefile
        pkgsrc/devel/glib2/patches: patch-gio_gunixmounts.c
            patch-gio_tests_meson.build patch-gmodule_gmodule.c
            patch-meson.build
Added Files:
        pkgsrc/devel/glib2/patches: patch-glib_gspawn-posix.c
            patch-meson.options
Removed Files:
        pkgsrc/devel/glib2/patches: patch-glib_gspawn.c patch-meson_options.txt

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

Overview of changes in GLib 2.82.2, 2024-10-17
==============================================

* Bugs fixed:
  - glib/gvariant: incorrect use of G_ANALYZER_ANALYZING (Christian
    Hergert)
  - Multicast cannot be joined on Mac OS on non-default interface
    (Nirbheek Chauhan)
  - Update Catalan translation
  - Backport “glib/gvariant: Fix check for G_ANALYZER_ANALYZING” to
    glib-2-82
  - Backport “macos: Fix URL launcher” to glib-2-82
  - Backport “gopenuriportal: Fix two memory leaks” to glib-2-82
  - Backport “gio: Fix multicast iface selection on macOS” to
    glib-2-82
  - Backport “gdatainputstream: Fix length return value on UTF-8
    validation failure“ to glib-2-82

* Translation updates:
  - Catalan (Jordi Mas)

Overview of changes in GLib 2.82.1, 2024-09-19
==============================================

* Fix a potential buffer overflow in `GSocks4aProxy`

* Bugs fixed:
  - Test /unix-mounts/get-mount-entries fails unless libmount is enabled
    (Philip Withnall)
  - Buffer overflow in set_connect_msg() (Michael Catanzaro)
  - Backport “tests: Test against a sample mtab file in unix-mounts
    for getmntent()” to glib-2-82
  - Backport “tests: Run lint tests with detected bash” to glib-2-82
  - Update Polish translation for glib-2-82
  - Update Czech translation [glib-2-82]
  - Update Portuguese translation
  - Update fa.po
  - Update Brazilian Portuguese translation
  - Backport “Update french translation” to glib-2-82
  - Update Galician translations for glib-2-82
  - Update German translation
  - Update Bulgarian translation
  - Update British English translation
  - Update Hungarian translation
  - Update Indonesian translation
  - Updated Lithuanian translation
  - Update Danish translation (2-82)
  - Update Russian translation for 2-82
  - Backport “docs(glib): Fix link in string-utils ref” to glib-2-82
  - Update Georgian translation (glib-2-82)
  - Backport “Move to Apple Silicon based runner” to glib-2-82
  - Backport “gsocks4aproxy: Fix a single byte buffer overflow in
    connect messages” to glib-2-82

* Translation updates:
  - Bulgarian (twlvnn kraftwerk)
  - Czech (AsciiWolf)
  - Danish (Ask Hjorth Larsen)
  - English (United Kingdom) (Bruce Cowan)
  - French (Vincent Chatelain)
  - Galician (Fran Diéguez)
  - Georgian (NorwayFun)
  - German (Tim Sabsch)
  - Hungarian (Balázs Úr)
  - Indonesian (Andika Triwidada)
  - Lithuanian (Aurimas Černius)
  - Persian (Danial Behzadi)
  - Polish (Piotr Drąg)
  - Portuguese (Hugo Carvalho)
  - Portuguese (Brazil) (Rafael Fontenelle)
  - Russian (jtux270)

Overview of changes in GLib 2.82.0, 2024-08-26
==============================================

* Change the default value of -Dglib_debug from `auto` to `enabled` for
  developers — distributions will almost certainly want to override it to
  `-Dglib_debug=disabled` for package release builds though

* Revert per-instance locking changes in `GCancellable` as they introduced new
  races

* Bugs fixed:
  - Investigate trampoline performance implications in g_mutex_lock_impl()
    changes (Philip Withnall)
  - Default value for glib_debug meson option (Philip Withnall)
  - wrong comment in gmessage.c:escape_string
  - Should check for epoll_create1 rather than epoll_create (Philip
    Withnall)
  - Gio.MenuModel docs have an outdated UI example (Philip Withnall)
  - Replace hi.po with updated translations.
  - gunixmounts: Fix use of uninitialised variable
  - tests: Run expected-to-hang cancellable tests in subprocesses
  - CI/msys2-mingw32: Set the G_DEBUGGER environment variable
  - Update Chinese translation
  - Update Swedish translation
  - Revert “GCancellable: Use per-instance mutex logic instead of
    global critical sections” for glib-2-82
  - Various small backports to glib-2-82
  - Backport “gthread: Move thread _impl functions to static inlines
    for speed” to glib-2-82

* Translation updates:
  - Chinese (China) (lumingzh)
  - Hindi (Karunakar Guntupalli)
  - Swedish (Anders Jonsson)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/gdbus-codegen/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/gdbus-codegen/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/gdbus-codegen/patches/patch-meson.build
cvs rdiff -u -r1.307 -r1.308 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/devel/glib2/Makefile.common
cvs rdiff -u -r1.158 -r1.159 pkgsrc/devel/glib2/PLIST
cvs rdiff -u -r1.330 -r1.331 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/glib2-tools/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c \
    pkgsrc/devel/glib2/patches/patch-meson.options
cvs rdiff -u -r1.3 -r0 pkgsrc/devel/glib2/patches/patch-glib_gspawn.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/glib2/patches/patch-gmodule_gmodule.c
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/glib2/patches/patch-meson.build
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/glib2/patches/patch-meson_options.txt

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/Makefile
diff -u pkgsrc/devel/gdbus-codegen/Makefile:1.31 pkgsrc/devel/gdbus-codegen/Makefile:1.32
--- pkgsrc/devel/gdbus-codegen/Makefile:1.31    Fri Feb  9 09:31:45 2024
+++ pkgsrc/devel/gdbus-codegen/Makefile Tue Oct 22 09:50:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2024/02/09 09:31:45 adam Exp $
+# $NetBSD: Makefile,v 1.32 2024/10/22 09:50:39 adam Exp $
 
 .include "../../devel/glib2/Makefile.common"
 
@@ -25,6 +25,6 @@ SUBST_SED.autovars+=  -e 's,@DATADIR@,${P
 REPLACE_PYTHON+=       gdbus-codegen.in
 
 .include "../../devel/meson/build.mk"
-.include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/batteries-included.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/gdbus-codegen/distinfo
diff -u pkgsrc/devel/gdbus-codegen/distinfo:1.51 pkgsrc/devel/gdbus-codegen/distinfo:1.52
--- pkgsrc/devel/gdbus-codegen/distinfo:1.51    Fri Jul 19 07:27:33 2024
+++ pkgsrc/devel/gdbus-codegen/distinfo Tue Oct 22 09:50:39 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.51 2024/07/19 07:27:33 adam Exp $
+$NetBSD: distinfo,v 1.52 2024/10/22 09:50:39 adam Exp $
 
-BLAKE2s (glib-2.80.4.tar.xz) = 6943db2a46b6f6c1786cedeef77f5d5573a683ed368a6a7a3ffa640beddd8840
-SHA512 (glib-2.80.4.tar.xz) = efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570
-Size (glib-2.80.4.tar.xz) = 5535760 bytes
-SHA1 (patch-meson.build) = 5f0643d176cf3494157fb77e5d5c398c49935742
+BLAKE2s (glib-2.82.2.tar.xz) = 1b7b71bc983be2c3699e286fc601dd091d92698eb10f17eadb3b581459a04593
+SHA512 (glib-2.82.2.tar.xz) = d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1
+Size (glib-2.82.2.tar.xz) = 5555528 bytes
+SHA1 (patch-meson.build) = 0ada9671c442670137330ea3b01f3d8e4aecaffd

Index: pkgsrc/devel/gdbus-codegen/patches/patch-meson.build
diff -u pkgsrc/devel/gdbus-codegen/patches/patch-meson.build:1.3 pkgsrc/devel/gdbus-codegen/patches/patch-meson.build:1.4
--- pkgsrc/devel/gdbus-codegen/patches/patch-meson.build:1.3    Tue Apr  9 16:57:17 2024
+++ pkgsrc/devel/gdbus-codegen/patches/patch-meson.build        Tue Oct 22 09:50:39 2024
@@ -1,11 +1,14 @@
-$NetBSD: patch-meson.build,v 1.3 2024/04/09 16:57:17 wiz Exp $
+$NetBSD: patch-meson.build,v 1.4 2024/10/22 09:50:39 adam Exp $
 
 Turn into a meson.build file which meson will accept, and
 subsitute some variables.
 
---- meson.build.orig   2024-03-07 21:35:05.000000000 +0000
+--- meson.build.orig   2024-10-17 11:08:41.000000000 +0000
 +++ meson.build
-@@ -1,3 +1,7 @@
+@@ -15,6 +15,10 @@
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ 
 +project('gdbus_codegen')
 +
 +fs=import('fs')
@@ -13,14 +16,14 @@ subsitute some variables.
  gdbus_codegen_files = [
    '__init__.py',
    'codegen.py',
-@@ -11,11 +15,11 @@ gdbus_codegen_files = [
+@@ -28,11 +32,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('PYTHON', python.full_path())
 -gdbus_codegen_conf.set('DATADIR', glib_datadir)
 +gdbus_codegen_conf.set('VERSION', '@VERSION@')
 +gdbus_codegen_conf.set('MAJOR_VERSION', '@MAJOR_VERSION@')
@@ -30,7 +33,7 @@ subsitute some variables.
  
  # Install gdbus-codegen executable
  gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
-@@ -27,7 +31,7 @@ gdbus_codegen = configure_file(input : '
+@@ -44,7 +48,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)
  

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.307 pkgsrc/devel/glib2/Makefile:1.308
--- pkgsrc/devel/glib2/Makefile:1.307   Fri Jul 26 15:34:43 2024
+++ pkgsrc/devel/glib2/Makefile Tue Oct 22 09:50:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.307 2024/07/26 15:34:43 wiz Exp $
+# $NetBSD: Makefile,v 1.308 2024/10/22 09:50:38 adam Exp $
 
 .include "Makefile.common"
 
@@ -9,6 +9,9 @@ TOOL_DEPENDS+=  ${PYPKGPREFIX}-packaging-
 
 .include "options.mk"
 
+# failed: No probe sites found for declared provider
+MESON_ARGS+=   -Ddtrace=disabled
+MESON_ARGS+=   -Dglib_debug=disabled
 MESON_ARGS+=   -Dintrospection=disabled
 MESON_ARGS+=   -Dinstalled_tests=false
 # Avoid linux dependency on libmount-dev
@@ -49,12 +52,6 @@ REPLACE_PYTHON+=     glib/gtester-report.in
 REPLACE_PYTHON+=       glib/update-gtranslit.py
 REPLACE_PYTHON+=       gobject/tests/mkenums.py
 
-SUBST_CLASSES+=                python
-SUBST_STAGE.python=    post-build
-SUBST_FILES.python+=   output/glib/gtester-report
-SUBST_MESSAGE.python=  Fixing path to Python.
-SUBST_SED.python+=     -e "s,^\(.*\)/usr/bin/env.*,\1${PYTHONBIN},"
-
 SUBST_CLASSES+=                meson
 SUBST_STAGE.meson=     pre-configure
 SUBST_FILES.meson+=    meson.build
@@ -110,7 +107,7 @@ post-extract:
 .include "../../devel/meson/build.mk"
 .include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/glib2/Makefile.common
diff -u pkgsrc/devel/glib2/Makefile.common:1.120 pkgsrc/devel/glib2/Makefile.common:1.121
--- pkgsrc/devel/glib2/Makefile.common:1.120    Fri Jul 19 07:27:33 2024
+++ pkgsrc/devel/glib2/Makefile.common  Tue Oct 22 09:50:38 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.120 2024/07/19 07:27:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.121 2024/10/22 09:50:38 adam Exp $
 # used by devel/gdbus-codegen/Makefile
 # used by devel/glib2/Makefile
 # used by devel/glib2-tools/Makefile
 
-DISTNAME=      glib-2.80.4
+DISTNAME=      glib-2.82.2
 PKGNAME=       ${DISTNAME:S/glib/glib2/}
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/glib/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -12,12 +12,9 @@ MAINTAINER=  prlw1%cam.ac.uk@localhost
 HOMEPAGE=      https://developer.gnome.org/glib/
 LICENSE=       gnu-lgpl-v2.1
 
-USE_LANGUAGES= c c++
-USE_TOOLS+=    msgfmt pkg-config xgettext
-
-USE_CC_FEATURES+=      c99
+USE_CC_FEATURES=       c99
+USE_LANGUAGES=         c c++
+USE_TOOLS+=            msgfmt pkg-config xgettext
 
 # does snprintf %d with pid_t...
 BUILDLINK_TRANSFORM+=  rm:-Werror=format=2
-
-PYTHON_VERSIONS_INCOMPATIBLE=  27

Index: pkgsrc/devel/glib2/PLIST
diff -u pkgsrc/devel/glib2/PLIST:1.158 pkgsrc/devel/glib2/PLIST:1.159
--- pkgsrc/devel/glib2/PLIST:1.158      Fri Jul 19 07:27:33 2024
+++ pkgsrc/devel/glib2/PLIST    Tue Oct 22 09:50:38 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.158 2024/07/19 07:27:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.159 2024/10/22 09:50:38 adam Exp $
 ${PLIST.nococoa}bin/gapplication
 bin/gdbus
 bin/gi-compile-repository
@@ -323,22 +323,22 @@ include/glib-2.0/gobject/gvaluetypes.h
 lib/glib-2.0/include/glibconfig.h
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
-lib/libgio-2.0.so.0.8000.4
+lib/libgio-2.0.so.0.8200.2
 lib/libgirepository-2.0.so
 lib/libgirepository-2.0.so.0
-lib/libgirepository-2.0.so.0.8000.4
+lib/libgirepository-2.0.so.0.8200.2
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
-lib/libglib-2.0.so.0.8000.4
+lib/libglib-2.0.so.0.8200.2
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
-lib/libgmodule-2.0.so.0.8000.4
+lib/libgmodule-2.0.so.0.8200.2
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
-lib/libgobject-2.0.so.0.8000.4
+lib/libgobject-2.0.so.0.8200.2
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
-lib/libgthread-2.0.so.0.8000.4
+lib/libgthread-2.0.so.0.8200.2
 lib/pkgconfig/gio-2.0.pc
 lib/pkgconfig/gio-unix-2.0.pc
 lib/pkgconfig/girepository-2.0.pc
@@ -352,8 +352,8 @@ ${PLIST.nococoa}libexec/gio-launch-deskt
 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.8000.4-gdb.py
-share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.8000.4-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libglib-2.0.so.0.8200.2-gdb.py
+share/gdb/auto-load${LOCALBASE}/lib/libgobject-2.0.so.0.8200.2-gdb.py
 share/gettext/its/gschema.its
 share/gettext/its/gschema.loc
 share/glib-2.0/dtds/gresource.dtd

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.330 pkgsrc/devel/glib2/distinfo:1.331
--- pkgsrc/devel/glib2/distinfo:1.330   Fri Jul 26 15:34:43 2024
+++ pkgsrc/devel/glib2/distinfo Tue Oct 22 09:50:38 2024
@@ -1,29 +1,29 @@
-$NetBSD: distinfo,v 1.330 2024/07/26 15:34:43 wiz Exp $
+$NetBSD: distinfo,v 1.331 2024/10/22 09:50:38 adam Exp $
 
-BLAKE2s (glib-2.80.4.tar.xz) = 6943db2a46b6f6c1786cedeef77f5d5573a683ed368a6a7a3ffa640beddd8840
-SHA512 (glib-2.80.4.tar.xz) = efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570
-Size (glib-2.80.4.tar.xz) = 5535760 bytes
+BLAKE2s (glib-2.82.2.tar.xz) = 1b7b71bc983be2c3699e286fc601dd091d92698eb10f17eadb3b581459a04593
+SHA512 (glib-2.82.2.tar.xz) = d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1
+Size (glib-2.82.2.tar.xz) = 5555528 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 9bd0befe0dd547f6f2d818e52bee14e31a017ac7
 SHA1 (patch-gio_giomodule.c) = 8e12ba27d0f13f43cff9a4e2301edf67aba0d1fe
 SHA1 (patch-gio_glib-compile-schemas.c) = 4fc8e8ba62bef01762007ebf21569053374808d0
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
-SHA1 (patch-gio_gunixmounts.c) = 48b6945fde5b1721ca246eb7e79f73b5b480e816
+SHA1 (patch-gio_gunixmounts.c) = c5d6f75c9b77078682ba171243108cb850b0faab
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
 SHA1 (patch-gio_meson.build) = 317da05e008d7bbdbc4c02c3057e8bef514fafae
-SHA1 (patch-gio_tests_meson.build) = 771a8f9c6ad23850388d038eed9b281b6490ba3f
+SHA1 (patch-gio_tests_meson.build) = a65475efdc24347d79d01a75f351d57b3e487316
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = 45e382a4b5412c69b310fd26482eff6faffa2c0d
-SHA1 (patch-glib_gspawn.c) = 77177c2575a205fde3f00d6773254ee017963d64
+SHA1 (patch-glib_gspawn-posix.c) = ac7536dbb14662d9a8ea27fb32ca911a3b4ab43d
 SHA1 (patch-glib_gthread.c) = 2485f63f27090f99e846c3b58432f6450cc95158
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
 SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
 SHA1 (patch-glib_tests_meson.build) = 40ce43a49ae7084116facac6b3926c5e545f6721
 SHA1 (patch-glib_tests_thread.c) = 84f46a31cbc7cdfd9503da73f8b4f9654201964f
-SHA1 (patch-gmodule_gmodule.c) = a020920b8e5bad34550c9963eb2fc27bef24c5c9
+SHA1 (patch-gmodule_gmodule.c) = b5105399d693d3e127abfde9b32e643b8150aa94
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
-SHA1 (patch-meson.build) = 7a4ec80905eff073443250bca91cff0f6cf4c1f2
-SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
+SHA1 (patch-meson.build) = 3003871e42f3844f89e0e65e16fd242088ef153a
+SHA1 (patch-meson.options) = da8fb4d6933865c7b1382a7e254137d351806027

Index: pkgsrc/devel/glib2-tools/Makefile
diff -u pkgsrc/devel/glib2-tools/Makefile:1.13 pkgsrc/devel/glib2-tools/Makefile:1.14
--- pkgsrc/devel/glib2-tools/Makefile:1.13      Sat Sep 16 03:09:01 2023
+++ pkgsrc/devel/glib2-tools/Makefile   Tue Oct 22 09:50:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/09/16 03:09:01 adam Exp $
+# $NetBSD: Makefile,v 1.14 2024/10/22 09:50:39 adam Exp $
 
 .include "../../devel/glib2/Makefile.common"
 
@@ -29,5 +29,5 @@ do-install:
        cd ${WRKSRC}/gobject \
        && ${INSTALL_SCRIPT} ${PYSCRIPTS} ${DESTDIR}${PREFIX}/bin
 
-.include "../../lang/python/application.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c:1.7 pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c:1.8
--- pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c:1.7      Thu Oct  6 13:34:07 2022
+++ pkgsrc/devel/glib2/patches/patch-gio_gunixmounts.c  Tue Oct 22 09:50:38 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-gio_gunixmounts.c,v 1.7 2022/10/06 13:34:07 adam Exp $
+$NetBSD: patch-gio_gunixmounts.c,v 1.8 2024/10/22 09:50:38 adam Exp $
 
 SunOS has sys/mntent.h but no mnt_opts.
 XXX who else uses the sys/mntent.h case?
 https://gitlab.gnome.org/GNOME/glib/merge_requests/890
 
---- gio/gunixmounts.c.orig     2021-08-19 15:27:25.722339900 +0000
+--- gio/gunixmounts.c.orig     2024-10-17 11:08:41.000000000 +0000
 +++ gio/gunixmounts.c
-@@ -743,7 +743,7 @@ _g_get_unix_mounts (void)
+@@ -835,7 +835,7 @@ _g_unix_mounts_get_from_file (const char
                                               mntent.mnt_mountp,
                                               NULL,
                                               mntent.mnt_fstype,
@@ -14,4 +14,4 @@ https://gitlab.gnome.org/GNOME/glib/merg
 +                                             mntent.mnt_mntopts,
                                               is_read_only);
  
-       return_list = g_list_prepend (return_list, mount_entry);
+       g_ptr_array_add (return_array, g_steal_pointer (&mount_entry));

Index: pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.9 pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.10
--- pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build:1.9  Tue Apr  9 16:57:18 2024
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_meson.build      Tue Oct 22 09:50:38 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-gio_tests_meson.build,v 1.9 2024/04/09 16:57:18 wiz Exp $
+$NetBSD: patch-gio_tests_meson.build,v 1.10 2024/10/22 09:50:38 adam Exp $
 
 Work around PR pkg/57399. + DYLD_LIBRARY_PATH for macOS
 
---- gio/tests/meson.build.orig 2024-03-07 21:35:05.000000000 +0000
+--- gio/tests/meson.build.orig 2024-10-17 11:08:41.000000000 +0000
 +++ gio/tests/meson.build
-@@ -798,6 +798,10 @@ if not meson.is_cross_build()
+@@ -815,6 +815,10 @@ if not meson.is_cross_build()
      plugin_resources_c = custom_target('plugin-resources.c',
        input : 'test4.gresource.xml',
        output : 'plugin-resources.c',
@@ -15,9 +15,9 @@ Work around PR pkg/57399. + DYLD_LIBRARY
        command : [glib_compile_resources,
                   compiler_type,
                   '--target=@OUTPUT@',
-@@ -831,6 +835,10 @@ if not meson.is_cross_build()
+@@ -848,6 +852,10 @@ if not meson.is_cross_build()
      input : 'test.gresource.xml',
-     depends : test_generated_txt,
+     depends : [test_generated_txt, gspawn_helpers],
      output : 'test.gresource',
 +    env : {
 +      'LC_ALL': 'en_US.UTF-8',
@@ -26,9 +26,9 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -845,6 +853,10 @@ if not meson.is_cross_build()
-   test_resources2_c = custom_target('test_resources2.c',
+@@ -863,6 +871,10 @@ if not meson.is_cross_build()
      input : 'test3.gresource.xml',
+     depends : [gspawn_helpers],
      output : 'test_resources2.c',
 +    env : {
 +      'LC_ALL': 'en_US.UTF-8',
@@ -37,9 +37,9 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -858,6 +870,10 @@ if not meson.is_cross_build()
-   test_resources2_h = custom_target('test_resources2.h',
+@@ -877,6 +889,10 @@ if not meson.is_cross_build()
      input : 'test3.gresource.xml',
+     depends : [gspawn_helpers],
      output : 'test_resources2.h',
 +    env : {
 +      'LC_ALL': 'en_US.UTF-8',
@@ -48,9 +48,9 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -872,6 +888,10 @@ if not meson.is_cross_build()
+@@ -891,6 +907,10 @@ if not meson.is_cross_build()
      input : 'test2.gresource.xml',
-     depends : big_test_resource,
+     depends : [big_test_resource, gspawn_helpers],
      output : 'test_resources.c',
 +    env : {
 +      'LC_ALL': 'en_US.UTF-8',
@@ -59,9 +59,9 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -885,6 +905,10 @@ if not meson.is_cross_build()
-   digit_test_resources_c = custom_target('digit_test_resources.c',
+@@ -905,6 +925,10 @@ if not meson.is_cross_build()
      input : '111_digit_test.gresource.xml',
+     depends : [gspawn_helpers],
      output : 'digit_test_resources.c',
 +    env : {
 +      'LC_ALL': 'en_US.UTF-8',
@@ -70,9 +70,9 @@ Work around PR pkg/57399. + DYLD_LIBRARY
      command : [glib_compile_resources,
                 compiler_type,
                 '--target=@OUTPUT@',
-@@ -898,6 +922,10 @@ if not meson.is_cross_build()
-   digit_test_resources_h = custom_target('digit_test_resources.h',
+@@ -919,6 +943,10 @@ if not meson.is_cross_build()
      input : '111_digit_test.gresource.xml',
+     depends : [gspawn_helpers],
      output : 'digit_test_resources.h',
 +    env : {
 +      'LC_ALL': 'en_US.UTF-8',

Index: pkgsrc/devel/glib2/patches/patch-gmodule_gmodule.c
diff -u pkgsrc/devel/glib2/patches/patch-gmodule_gmodule.c:1.3 pkgsrc/devel/glib2/patches/patch-gmodule_gmodule.c:1.4
--- pkgsrc/devel/glib2/patches/patch-gmodule_gmodule.c:1.3      Wed Jun 30 14:26:11 2021
+++ pkgsrc/devel/glib2/patches/patch-gmodule_gmodule.c  Tue Oct 22 09:50:39 2024
@@ -1,17 +1,17 @@
-$NetBSD: patch-gmodule_gmodule.c,v 1.3 2021/06/30 14:26:11 prlw1 Exp $
+$NetBSD: patch-gmodule_gmodule.c,v 1.4 2024/10/22 09:50:39 adam Exp $
 
 RTL_GLOBAL is a bug.
 https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2171
 
---- gmodule/gmodule.c.orig     2021-06-10 18:57:57.268194400 +0000
+--- gmodule/gmodule.c.orig     2024-10-17 11:08:41.000000000 +0000
 +++ gmodule/gmodule.c
-@@ -506,9 +506,8 @@ g_module_open (const gchar    *file_name
+@@ -488,9 +488,8 @@ g_module_open_full (const gchar   *file_
        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__)
+-#if !defined(__ANDROID__) || !defined(__LP64__)
 +/* On Linux, handle == RTLD_DEFAULT is (void *)0x0 */
 +#if G_MODULE_IMPL != G_MODULE_IMPL_DL
          if (handle)

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.22 pkgsrc/devel/glib2/patches/patch-meson.build:1.23
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.22   Fri Jul 26 15:34:43 2024
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Tue Oct 22 09:50:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.22 2024/07/26 15:34:43 wiz Exp $
+$NetBSD: patch-meson.build,v 1.23 2024/10/22 09:50:39 adam Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -14,9 +14,9 @@ $NetBSD: patch-meson.build,v 1.22 2024/0
 
 - Check also for sys/ptrace.h header file.
 
---- meson.build.orig   2024-07-08 14:03:15.000000000 +0000
-+++ meson.build        2024-07-26 14:38:02.009750717 +0000
-@@ -412,6 +412,7 @@ headers = [
+--- meson.build.orig   2024-10-17 11:08:41.000000000 +0000
++++ meson.build
+@@ -418,6 +418,7 @@ headers = [
    'sys/mount.h',
    'sys/param.h',
    'sys/prctl.h',
@@ -24,7 +24,7 @@ $NetBSD: patch-meson.build,v 1.22 2024/0
    'sys/resource.h',
    'sys/select.h',
    'sys/statfs.h',
-@@ -967,7 +968,7 @@ if host_system == 'darwin'
+@@ -983,7 +984,7 @@ if host_system == 'darwin'
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -33,7 +33,7 @@ $NetBSD: patch-meson.build,v 1.22 2024/0
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
      osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-@@ -2307,18 +2308,17 @@ if host_system != 'windows' and get_opti
+@@ -2345,18 +2346,17 @@ if host_system != 'windows' and get_opti
  
    # try glibc
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
@@ -54,19 +54,16 @@ $NetBSD: patch-meson.build,v 1.22 2024/0
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2419,9 +2419,9 @@ endif
+@@ -2457,7 +2457,7 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
--python = import('python').find_installation(modules: ['packaging'])
-+python = import('python').find_installation('@PYTHONBIN@', modules: ['packaging'])
- # used for '#!/usr/bin/env <name>'
--python_name = 'python3'
-+python_name = python.path()
+-python = import('python').find_installation()
++python = import('python').find_installation('@PYTHONBIN@')
  
  python_version = python.language_version()
  python_version_req = '>=3.7'
-@@ -2431,7 +2431,7 @@ endif
+@@ -2467,7 +2467,7 @@ endif
  
  # Determine which user environment-dependent files that we want to install
  bash = find_program('bash', required : false)
@@ -75,7 +72,7 @@ $NetBSD: patch-meson.build,v 1.22 2024/0
  bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)
  have_sh = find_program('sh', required : false).found() # For glib-gettextize
  have_pkg_config = find_program('pkg-config', required: false).found()
-@@ -2441,8 +2441,7 @@ env_program = find_program('env', requir
+@@ -2477,8 +2477,7 @@ env_program = find_program('env', requir
  
  # FIXME: How to detect Solaris? https://github.com/mesonbuild/meson/issues/1578
  if host_system == 'sunos'

Added files:

Index: pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c:1.1
--- /dev/null   Tue Oct 22 09:50:39 2024
+++ pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c        Tue Oct 22 09:50:39 2024
@@ -0,0 +1,20 @@
+$NetBSD: patch-glib_gspawn-posix.c,v 1.1 2024/10/22 09:50:39 adam Exp $
+
+Avoid the build failure with Clang on FreeBSD (see PR 54752).
+Set environ as a weak symbol (thanks to Joerg).
+
+--- glib/gspawn-posix.c.orig   2024-10-17 11:08:41.000000000 +0000
++++ glib/gspawn-posix.c
+@@ -101,8 +101,12 @@
+ #ifdef HAVE__NSGETENVIRON
+ #define environ (*_NSGetEnviron())
+ #else
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++extern __attribute__((__weak__)) char **environ;
++#else
+ extern char **environ;
+ #endif
++#endif
+ 
+ #ifndef O_CLOEXEC
+ #define O_CLOEXEC 0
Index: pkgsrc/devel/glib2/patches/patch-meson.options
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-meson.options:1.1
--- /dev/null   Tue Oct 22 09:50:39 2024
+++ pkgsrc/devel/glib2/patches/patch-meson.options      Tue Oct 22 09:50:39 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-meson.options,v 1.1 2024/10/22 09:50:39 adam Exp $
+
+Add use_cocoa option.
+
+--- meson.options.orig 2019-10-04 11:44:24.000000000 +0000
++++ meson.options
+@@ -90,6 +90,11 @@ option('nls',
+        yield: true,
+        description : 'Enable native language support (translations)')
+ 
++option('use_cocoa',
++       type : 'boolean',
++       value : false,
++       description : 'Use Cocoa on macOS')
++
+ option('oss_fuzz',
+        type : 'feature',
+        value : 'disabled',

Prev by Date: CVS commit: pkgsrc/devel/libgit2
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/libgit2
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index