CVS commit: pkgsrc/devel/glib2

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jun  3 11:05:06 UTC 2025

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-meson.build
Added Files:
        pkgsrc/devel/glib2/patches: patch-gio_meson.build

Log Message:
glib2: Explicitly avoid epoll/inotify on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r0 -r1.12 pkgsrc/devel/glib2/patches/patch-gio_meson.build
cvs rdiff -u -r1.24 -r1.25 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/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.334 pkgsrc/devel/glib2/distinfo:1.335
--- pkgsrc/devel/glib2/distinfo:1.334   Tue May 27 19:07:42 2025
+++ pkgsrc/devel/glib2/distinfo Tue Jun  3 11:05:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.334 2025/05/27 19:07:42 adam Exp $
+$NetBSD: distinfo,v 1.335 2025/06/03 11:05:06 jperkin Exp $
 
 BLAKE2s (glib-2.84.2.tar.xz) = 907fddcb7ff2c1b8fd8fac1c74a0b318200517fdb84552e74ba8445ccaec2df3
 SHA512 (glib-2.84.2.tar.xz) = 430928d7d7a442fc3927ca943f2569035fe8768768a0ebc6720ae1ef152b56fc5f8d4215d21b4828cc2f39a8632c907ed2c52a0c8566da1c533a2e049a1a121f
@@ -10,6 +10,7 @@ SHA1 (patch-gio_gresource-tool.c) = ad0e
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = c5d6f75c9b77078682ba171243108cb850b0faab
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
+SHA1 (patch-gio_meson.build) = 818a1edffec511e70e4b71e639d349816d6b009e
 SHA1 (patch-gio_tests_meson.build) = a65475efdc24347d79d01a75f351d57b3e487316
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
@@ -23,5 +24,5 @@ SHA1 (patch-glib_tests_thread.c) = 84f46
 SHA1 (patch-gmodule_gmodule.c) = b5105399d693d3e127abfde9b32e643b8150aa94
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = a3953d33ba7e906ff1df024221ac3ab32f6c0c66
-SHA1 (patch-meson.build) = 85873953b8221438a75d6da910978938e1d8cddb
+SHA1 (patch-meson.build) = 0268e1d05fbb4ad80abda52d8c13986907077d4c
 SHA1 (patch-meson.options) = da8fb4d6933865c7b1382a7e254137d351806027

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.24 pkgsrc/devel/glib2/patches/patch-meson.build:1.25
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.24   Tue May 27 19:07:43 2025
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Tue Jun  3 11:05:06 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.24 2025/05/27 19:07:43 adam Exp $
+$NetBSD: patch-meson.build,v 1.25 2025/06/03 11:05:06 jperkin Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -12,6 +12,8 @@ $NetBSD: patch-meson.build,v 1.24 2025/0
 
 - Check also for sys/ptrace.h header file.
 
+- Explicitly avoid epoll on SunOS.
+
 --- meson.build.orig   2025-05-20 16:22:25.000000000 +0000
 +++ meson.build
 @@ -438,6 +438,7 @@ headers = [
@@ -22,7 +24,26 @@ $NetBSD: patch-meson.build,v 1.24 2025/0
    'sys/resource.h',
    'sys/select.h',
    'sys/statfs.h',
-@@ -1010,7 +1011,7 @@ if host_system == 'darwin'
+@@ -700,7 +701,6 @@ functions = [
+   'copy_file_range',
+   'endmntent',
+   'endservent',
+-  'epoll_create1',
+   'faccessat',
+   'fallocate',
+   'fchmod',
+@@ -764,6 +764,10 @@ functions = [
+   'sysctlbyname',
+ ]
+ 
++if host_system != 'sunos'
++  functions += ['epoll_create1']
++endif
++
+ # _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,7 +1014,7 @@ if host_system == 'darwin'
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -31,7 +52,7 @@ $NetBSD: patch-meson.build,v 1.24 2025/0
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
      osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-@@ -2379,18 +2380,17 @@ if host_system != 'windows' and get_opti
+@@ -2379,18 +2383,17 @@ if host_system != 'windows' and get_opti
  
    # try glibc
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
@@ -52,7 +73,7 @@ $NetBSD: patch-meson.build,v 1.24 2025/0
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2491,7 +2491,7 @@ endif
+@@ -2491,7 +2494,7 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
@@ -61,7 +82,7 @@ $NetBSD: patch-meson.build,v 1.24 2025/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
-@@ -2510,7 +2510,7 @@ python_test_libraries_built = meson.proj
+@@ -2510,7 +2513,7 @@ python_test_libraries_built = meson.proj
  
  # 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_meson.build
diff -u /dev/null pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.12
--- /dev/null   Tue Jun  3 11:05:06 2025
+++ pkgsrc/devel/glib2/patches/patch-gio_meson.build    Tue Jun  3 11:05:06 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-gio_meson.build,v 1.12 2025/06/03 11:05:06 jperkin Exp $
+
+Do not use inotify on SunOS.
+
+--- gio/meson.build.orig       2025-06-03 10:43:41.187491613 +0000
++++ gio/meson.build
+@@ -789,7 +789,7 @@ gioenumtypes_dep = declare_dependency(so
+ 
+ file_monitor_backend = get_option('file_monitor_backend')
+ if file_monitor_backend == 'auto'
+-  if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1
++  if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1 and host_system != 'sunos'
+     file_monitor_backend = 'inotify'
+   elif have_func_kqueue and have_func_kevent
+     file_monitor_backend = 'kqueue'