CVS commit: pkgsrc/devel/glib2

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Mar 15 16:37:42 UTC 2026

Modified Files:
        pkgsrc/devel/glib2: Makefile distinfo
Added Files:
        pkgsrc/devel/glib2/patches: patch-girepository_gitypelib.c

Log Message:
glib2: copy over gobject-introspection's patch-girepository_gitypelib.c

Needed to make library loading for pkgsrc libraries work correctly
on macOS after py-gobject switched to girepository-2.0.


To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.340 -r1.341 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.311 pkgsrc/devel/glib2/Makefile:1.312
--- pkgsrc/devel/glib2/Makefile:1.311   Mon Jan  5 12:44:55 2026
+++ pkgsrc/devel/glib2/Makefile Sun Mar 15 16:37:42 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.311 2026/01/05 12:44:55 adam Exp $
+# $NetBSD: Makefile,v 1.312 2026/03/15 16:37:42 tnn Exp $
 
 .include "Makefile.common"
+PKGREVISION=   1
 
 CATEGORIES=    devel gnome
 COMMENT=       Some useful routines for C programming (glib2)
@@ -81,6 +82,11 @@ SUBST_SED.xdg=               -e 's,/usr/local/share/:
 SUBST_SED.xdg+=                -e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,'
 SUBST_SED.xdg+=                -e 's,/usr/share/locale,${PREFIX}/${PKGLOCALEDIR}/locale,'
 
+SUBST_CLASSES+=                libdirs
+SUBST_STAGE.libdirs=   pre-configure
+SUBST_FILES.libdirs+=  girepository/gitypelib.c
+SUBST_VARS.libdirs+=   PREFIX
+
 PKGCONFIG_OVERRIDE+=   output/meson-private/gio-2.0.pc
 PKGCONFIG_OVERRIDE+=   output/meson-private/gio-unix-2.0.pc
 PKGCONFIG_OVERRIDE+=   output/meson-private/glib-2.0.pc

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.340 pkgsrc/devel/glib2/distinfo:1.341
--- pkgsrc/devel/glib2/distinfo:1.340   Mon Feb 16 10:07:59 2026
+++ pkgsrc/devel/glib2/distinfo Sun Mar 15 16:37:42 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.340 2026/02/16 10:07:59 adam Exp $
+$NetBSD: distinfo,v 1.341 2026/03/15 16:37:42 tnn Exp $
 
 BLAKE2s (glib-2.86.4.tar.xz) = cfa4fdd8307ae8e8671d6588092fa3fe2213333a5fa8231004c1830979871f9f
 SHA512 (glib-2.86.4.tar.xz) = 13e8beb84f3464f50c9764d0d3c6822a4bb41ae65e6c3ffac4200a5b441acdd2eb6f838a6b0722cae501e367ce9cfd4f8516b684a391c2f088a593172abcacd9
@@ -12,6 +12,7 @@ SHA1 (patch-gio_gunixmounts.c) = c5d6f75
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
 SHA1 (patch-gio_meson.build) = 818a1edffec511e70e4b71e639d349816d6b009e
 SHA1 (patch-gio_tests_meson.build) = 864fb2e438c4537e37c2c2e39388d0d0e1795c8c
+SHA1 (patch-girepository_gitypelib.c) = 6a5a49ac9a746028115e261820a2b0f1c1380ea2
 SHA1 (patch-glib_gatomic.c) = 5d08e19cc1c2557a5c007af8b368968217ce65b0
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = 45e382a4b5412c69b310fd26482eff6faffa2c0d

Added files:

Index: pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c:1.1
--- /dev/null   Sun Mar 15 16:37:42 2026
+++ pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c   Sun Mar 15 16:37:42 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-girepository_gitypelib.c,v 1.1 2026/03/15 16:37:42 tnn Exp $
+
+Try to look for introspectable libraries in pkgsrc's ${PREFIX}/lib before
+any system default search patchs. Fixes this problem on macOS:
+
+$ python3.13
+>>> import gi
+>>> from gi.repository import Gtk
+
+GLib-GIRepository-WARNING **: 17:25:55.737: Failed to load shared library 'libpango-1.0.0.dylib' referenced by the typelib: dlopen(libpango-1.0.0.dylib, 0x0009): tried: 'libpango-1.0.0.dylib' (no 
such file), '/System/Volumes/Preboot/Cryptexes/OSlibpango-1.0.0.dylib' (no such file), '/usr/lib/libpango-1.0.0.dylib' (no such file, not in dyld cache), 'libpango-1.0.0.dylib' (no such file)
+
+--- girepository/gitypelib.c.orig      2026-03-15 16:23:25.520678132 +0000
++++ girepository/gitypelib.c
+@@ -2256,6 +2256,12 @@ load_one_shared_library (GITypelib  *typ
+           if (m != NULL)
+             return m;
+         }
++      /* try pkgsrc lib dir */
++      char *pkglibpath = g_build_filename ("@PREFIX@/lib", shlib, NULL);
++      m = g_module_open (pkglibpath, G_MODULE_BIND_LAZY);
++      g_free (pkglibpath);
++      if (m != NULL)
++        return m;
+     }
+ 
+   /* Then try loading from standard paths */