CVS commit: pkgsrc/devel/glib2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Oct 14 09:34:25 UTC 2026

Modified Files:
        pkgsrc/devel/glib2: Makefile distinfo
        pkgsrc/devel/glib2/patches: patch-girepository_gitypelib.c
            patch-glib_gspawn-posix.c patch-meson.build
Added Files:
        pkgsrc/devel/glib2/patches: patch-gio_tests_socket-address.c

Log Message:
glib2: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 pkgsrc/devel/glib2/Makefile
cvs rdiff -u -r1.352 -r1.353 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/glib2/patches/patch-gio_tests_socket-address.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c
cvs rdiff -u -r1.26 -r1.27 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/glib2/Makefile
diff -u pkgsrc/devel/glib2/Makefile:1.320 pkgsrc/devel/glib2/Makefile:1.321
--- pkgsrc/devel/glib2/Makefile:1.320   Wed Oct  7 11:12:45 2026
+++ pkgsrc/devel/glib2/Makefile Wed Oct 14 09:34:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.320 2026/10/07 11:12:45 adam Exp $
+# $NetBSD: Makefile,v 1.321 2026/10/14 09:34:25 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -26,7 +26,7 @@ MAKE_ENV+=    LD_LIBRARY_PATH=${WRKSRC}/out
 # For Darwin
 MAKE_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/output/gobject:${WRKSRC}/output/gmodule
 
-CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -D__stub_epoll_create
+CPPFLAGS.SunOS+=       -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS -D__stub_epoll_create
 LDFLAGS.SunOS+=                -lnsl -lsocket
 LDFLAGS.FreeBSD+=      -liconv
 

Index: pkgsrc/devel/glib2/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.352 pkgsrc/devel/glib2/distinfo:1.353
--- pkgsrc/devel/glib2/distinfo:1.352   Wed Oct  7 11:12:45 2026
+++ pkgsrc/devel/glib2/distinfo Wed Oct 14 09:34:25 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.352 2026/10/07 11:12:45 adam Exp $
+$NetBSD: distinfo,v 1.353 2026/10/14 09:34:25 jperkin Exp $
 
 BLAKE2s (glib-2.90.1.tar.xz) = 331e90767287ee31990f1ef6843a76fbd321b0235db41554c08f25df80790865
 SHA512 (glib-2.90.1.tar.xz) = d2d76deaad64e307034b09635c64a60537b0d625d1695b314bc33e9e3c9b20284270d2105333474eb1fbe5afcaa814d4c52ded3a1c2a46b4b2652f7b66a211c3
@@ -13,12 +13,13 @@ SHA1 (patch-gio_inotify_inotify-kernel.c
 SHA1 (patch-gio_meson.build) = 818a1edffec511e70e4b71e639d349816d6b009e
 SHA1 (patch-gio_tests_iptosmessage.c) = bb17313eb0eecfbc9b2c64c877b4871824b79f6a
 SHA1 (patch-gio_tests_meson.build) = 864fb2e438c4537e37c2c2e39388d0d0e1795c8c
-SHA1 (patch-girepository_gitypelib.c) = 6a5a49ac9a746028115e261820a2b0f1c1380ea2
+SHA1 (patch-gio_tests_socket-address.c) = 18e03c3afc1d99ae8423bd1f8473faff62d7ed28
+SHA1 (patch-girepository_gitypelib.c) = 844449d596cfd831ea294490657e669b6591466b
 SHA1 (patch-glib_gatomic.c) = 5d08e19cc1c2557a5c007af8b368968217ce65b0
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = 45e382a4b5412c69b310fd26482eff6faffa2c0d
 SHA1 (patch-glib_glib-unix.c) = 1c7ef6437680317f5e28c3e75bca26cfec48351f
-SHA1 (patch-glib_gspawn-posix.c) = cc5789c94aaaa3b0c586f882bd948610912019d1
+SHA1 (patch-glib_gspawn-posix.c) = 1d043689954b222a87243ddf61754b8fb1b50bc1
 SHA1 (patch-glib_gthread.c) = 52cedcf40ad82af9b9f45315aacf63a8abd93fd5
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
 SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
@@ -29,5 +30,5 @@ SHA1 (patch-gmodule_gmodule-dl.c) = a4b5
 SHA1 (patch-gmodule_gmodule.c) = b5105399d693d3e127abfde9b32e643b8150aa94
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
-SHA1 (patch-meson.build) = 13302f1295ab4d95a03d651b71724b3a7384a08d
+SHA1 (patch-meson.build) = 1c505d532ca7a40e06d2331097742b9b13ba06f6
 SHA1 (patch-meson.options) = da8fb4d6933865c7b1382a7e254137d351806027

Index: pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c
diff -u pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c:1.1 pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c:1.2
--- pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c:1.1       Sun Mar 15 16:37:42 2026
+++ pkgsrc/devel/glib2/patches/patch-girepository_gitypelib.c   Wed Oct 14 09:34:25 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-girepository_gitypelib.c,v 1.1 2026/03/15 16:37:42 tnn Exp $
+$NetBSD: patch-girepository_gitypelib.c,v 1.2 2026/10/14 09:34:25 jperkin Exp $
 
 Try to look for introspectable libraries in pkgsrc's ${PREFIX}/lib before
 any system default search patchs. Fixes this problem on macOS:
@@ -9,7 +9,7 @@ $ python3.13
 
 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.orig      2026-10-06 15:22:44.000000000 +0000
 +++ girepository/gitypelib.c
 @@ -2256,6 +2256,12 @@ load_one_shared_library (GITypelib  *typ
            if (m != NULL)

Index: pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c:1.2 pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c:1.3
--- pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c:1.2    Tue Sep 22 04:06:12 2026
+++ pkgsrc/devel/glib2/patches/patch-glib_gspawn-posix.c        Wed Oct 14 09:34:25 2026
@@ -1,11 +1,11 @@
-$NetBSD: patch-glib_gspawn-posix.c,v 1.2 2026/09/22 04:06:12 ryoon Exp $
+$NetBSD: patch-glib_gspawn-posix.c,v 1.3 2026/10/14 09:34:25 jperkin 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   2026-09-09 13:40:59.000000000 +0000
+--- glib/gspawn-posix.c.orig   2026-10-06 15:22:44.000000000 +0000
 +++ glib/gspawn-posix.c
-@@ -108,7 +108,11 @@
+@@ -108,8 +108,12 @@
  #include <dlfcn.h>
  #define environ (*((char***)dlsym(RTLD_DEFAULT, "environ")))
  #else
@@ -13,7 +13,8 @@ Set environ as a weak symbol (thanks to 
 +extern __attribute__((__weak__)) char **environ;
 +#else
  extern char **environ;
-+#endif
  #endif
++#endif
  
  #ifndef O_CLOEXEC
+ #define O_CLOEXEC 0

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.26 pkgsrc/devel/glib2/patches/patch-meson.build:1.27
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.26   Sun May  3 20:57:24 2026
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Wed Oct 14 09:34:25 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.26 2026/05/03 20:57:24 schmonz Exp $
+$NetBSD: patch-meson.build,v 1.27 2026/10/14 09:34:25 jperkin Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -14,9 +14,9 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
 
 - Explicitly avoid epoll on SunOS.
 
---- meson.build.orig   2026-03-16 13:53:50.000000000 +0000
+--- meson.build.orig   2026-10-06 15:22:44.000000000 +0000
 +++ meson.build
-@@ -443,6 +443,7 @@ headers = [
+@@ -442,6 +442,7 @@ headers = [
    'sys/mount.h',
    'sys/param.h',
    'sys/prctl.h',
@@ -24,7 +24,7 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
    'sys/resource.h',
    'sys/select.h',
    'sys/statfs.h',
-@@ -714,7 +715,6 @@ functions = [
+@@ -711,7 +712,6 @@ functions = [
    'copy_file_range',
    'endmntent',
    'endservent',
@@ -32,7 +32,7 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
    'faccessat',
    'fallocate',
    'fchmod',
-@@ -780,6 +780,10 @@ functions = [
+@@ -777,6 +777,10 @@ functions = [
    'sysctlbyname',
  ]
  
@@ -43,7 +43,7 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
  # _NSGetEnviron is available on iOS too, but its usage gets apps rejected from
  # the app store since it's considered 'private API'
  if host_system == 'darwin'
-@@ -1010,13 +1014,6 @@ glib_have_cocoa = false
+@@ -1007,13 +1011,6 @@ glib_have_cocoa = false
  if host_system == 'darwin' and subsystem == 'macos'
    add_languages('objc', native: false, required: true)
    objcc = meson.get_compiler('objc')
@@ -57,7 +57,7 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
  
    # Mac OS X Carbon support
    glib_have_carbon = objcc.compiles('''#include <Carbon/Carbon.h>
-@@ -1033,7 +1030,7 @@ if host_system == 'darwin' and subsystem
+@@ -1030,7 +1027,7 @@ if host_system == 'darwin' and subsystem
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -66,7 +66,7 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
      osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-@@ -2402,18 +2399,17 @@ if host_system != 'windows' and get_opti
+@@ -2403,18 +2400,17 @@ if host_system != 'windows' and get_opti
  
    # try glibc
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
@@ -87,7 +87,7 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2514,7 +2510,7 @@ endif
+@@ -2515,7 +2511,7 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
@@ -96,7 +96,7 @@ $NetBSD: patch-meson.build,v 1.26 2026/0
  
  # Sets the shebang on script files. This has been changed many times including
  # using env, the absolute path to the Python executable, and using both python
-@@ -2553,7 +2549,7 @@ endif
+@@ -2554,7 +2550,7 @@ endif
  
  # Determine which user environment-dependent files that we want to install
  bash = find_program('bash', required : false)

Added files:

Index: pkgsrc/devel/glib2/patches/patch-gio_tests_socket-address.c
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_tests_socket-address.c:1.1
--- /dev/null   Wed Oct 14 09:34:25 2026
+++ pkgsrc/devel/glib2/patches/patch-gio_tests_socket-address.c Wed Oct 14 09:34:25 2026
@@ -0,0 +1,57 @@
+$NetBSD: patch-gio_tests_socket-address.c,v 1.1 2026/10/14 09:34:25 jperkin Exp $
+
+Avoid 'sun' define on illumos.
+
+--- gio/tests/socket-address.c.orig    2026-10-14 08:49:55.664178810 +0000
++++ gio/tests/socket-address.c
+@@ -11,32 +11,32 @@ static void
+ test_socket_address_native_cornercases (void)
+ {
+   GSocketAddress *a;
+-  struct sockaddr_un sun;
++  struct sockaddr_un sockun;
+   struct sockaddr_un too_big[2];
+ 
+   /* no data */
+   g_assert_null (g_socket_address_new_from_native (NULL, 0));
+ 
+   /* not null-terminated unix path */
+-  memset (&sun, 'a', sizeof (struct sockaddr_un));
+-  sun.sun_family = AF_UNIX;
+-  a = g_socket_address_new_from_native (&sun, sizeof (sun));
++  memset (&sockun, 'a', sizeof (struct sockaddr_un));
++  sockun.sun_family = AF_UNIX;
++  a = g_socket_address_new_from_native (&sockun, sizeof (sockun));
+   g_assert_nonnull (a);
+   g_assert_true (G_IS_UNIX_SOCKET_ADDRESS (a));
+   /* ensure this gets null-terminated by the constructor */
+-  g_assert_cmpuint (g_unix_socket_address_get_path_len (G_UNIX_SOCKET_ADDRESS (a)), ==, sizeof (sun.sun_path));
++  g_assert_cmpuint (g_unix_socket_address_get_path_len (G_UNIX_SOCKET_ADDRESS (a)), ==, sizeof (sockun.sun_path));
+   g_object_unref (a);
+ 
+   /* unix path with embedded NULL */
+-  sun.sun_path[4] = 0;
+-  a = g_socket_address_new_from_native (&sun, sizeof (sun));
++  sockun.sun_path[4] = 0;
++  a = g_socket_address_new_from_native (&sockun, sizeof (sockun));
+   g_assert_nonnull (a);
+   g_assert_true (G_IS_UNIX_SOCKET_ADDRESS (a));
+-  g_assert_cmpuint (g_unix_socket_address_get_path_len (G_UNIX_SOCKET_ADDRESS (a)), ==, sizeof (sun.sun_path));
++  g_assert_cmpuint (g_unix_socket_address_get_path_len (G_UNIX_SOCKET_ADDRESS (a)), ==, sizeof (sockun.sun_path));
+   g_object_unref (a);
+ 
+   /* specific test for an error check in g_socket_address_new_from_native() */
+-  g_assert_null (g_socket_address_new_from_native (&sun, G_STRUCT_OFFSET (struct sockaddr_un, sun_path) - 1));
++  g_assert_null (g_socket_address_new_from_native (&sockun, G_STRUCT_OFFSET (struct sockaddr_un, sun_path) - 1));
+ 
+   /* not null-terminated unix path */
+   memset (&too_big, 'b', sizeof (too_big));
+@@ -44,7 +44,7 @@ test_socket_address_native_cornercases (
+   a = g_socket_address_new_from_native (too_big, sizeof (too_big));
+   g_assert_nonnull (a);
+   g_assert_true (G_IS_UNIX_SOCKET_ADDRESS (a));
+-  g_assert_cmpuint (g_unix_socket_address_get_path_len (G_UNIX_SOCKET_ADDRESS (a)), ==, sizeof (sun.sun_path));
++  g_assert_cmpuint (g_unix_socket_address_get_path_len (G_UNIX_SOCKET_ADDRESS (a)), ==, sizeof (sockun.sun_path));
+   g_object_unref (a);
+ }
+