CVS commit: pkgsrc/devel/glib2

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun May  3 20:57:24 UTC 2026

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

Log Message:
glib2: allow pre-10.13 macOS to configure.


To generate a diff of this commit:
cvs rdiff -u -r1.344 -r1.345 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.25 -r1.26 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.344 pkgsrc/devel/glib2/distinfo:1.345
--- pkgsrc/devel/glib2/distinfo:1.344   Thu Apr 30 16:23:46 2026
+++ pkgsrc/devel/glib2/distinfo Sun May  3 20:57:24 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.344 2026/04/30 16:23:46 tsutsui Exp $
+$NetBSD: distinfo,v 1.345 2026/05/03 20:57:24 schmonz Exp $
 
 BLAKE2s (glib-2.88.0.tar.xz) = 4623f7355733d27a2637c92f216d218ef316f5898b97d43e7d2d45a63fee6dd7
 SHA512 (glib-2.88.0.tar.xz) = ceead8d88720db17dc6bbff7aff14f261f90afc5e8261448aae0657f89b5fcc616cf62f4b049be88a4ddd3f50a869bbcdb66b29777da4969a47987828ecac280
@@ -28,5 +28,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) = 0268e1d05fbb4ad80abda52d8c13986907077d4c
+SHA1 (patch-meson.build) = 13302f1295ab4d95a03d651b71724b3a7384a08d
 SHA1 (patch-meson.options) = da8fb4d6933865c7b1382a7e254137d351806027

Index: pkgsrc/devel/glib2/patches/patch-meson.build
diff -u pkgsrc/devel/glib2/patches/patch-meson.build:1.25 pkgsrc/devel/glib2/patches/patch-meson.build:1.26
--- pkgsrc/devel/glib2/patches/patch-meson.build:1.25   Tue Jun  3 11:05:06 2025
+++ pkgsrc/devel/glib2/patches/patch-meson.build        Sun May  3 20:57:24 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.25 2025/06/03 11:05:06 jperkin Exp $
+$NetBSD: patch-meson.build,v 1.26 2026/05/03 20:57:24 schmonz Exp $
 
 - On Darwin, optionally use Cocoa (needed for X11 users).
 
@@ -14,9 +14,9 @@ $NetBSD: patch-meson.build,v 1.25 2025/0
 
 - Explicitly avoid epoll on SunOS.
 
---- meson.build.orig   2025-05-20 16:22:25.000000000 +0000
+--- meson.build.orig   2026-03-16 13:53:50.000000000 +0000
 +++ meson.build
-@@ -438,6 +438,7 @@ headers = [
+@@ -443,6 +443,7 @@ headers = [
    'sys/mount.h',
    'sys/param.h',
    'sys/prctl.h',
@@ -24,7 +24,7 @@ $NetBSD: patch-meson.build,v 1.25 2025/0
    'sys/resource.h',
    'sys/select.h',
    'sys/statfs.h',
-@@ -700,7 +701,6 @@ functions = [
+@@ -714,7 +715,6 @@ functions = [
    'copy_file_range',
    'endmntent',
    'endservent',
@@ -32,7 +32,7 @@ $NetBSD: patch-meson.build,v 1.25 2025/0
    'faccessat',
    'fallocate',
    'fchmod',
-@@ -764,6 +764,10 @@ functions = [
+@@ -780,6 +780,10 @@ functions = [
    'sysctlbyname',
  ]
  
@@ -43,7 +43,21 @@ $NetBSD: patch-meson.build,v 1.25 2025/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,7 +1014,7 @@ if host_system == 'darwin'
+@@ -1010,13 +1014,6 @@ glib_have_cocoa = false
+ if host_system == 'darwin' and subsystem == 'macos'
+   add_languages('objc', native: false, required: true)
+   objcc = meson.get_compiler('objc')
+-  if not objcc.compiles('''#include <AvailabilityMacros.h>
+-                           #if MAC_OS_X_VERSION_MIN_REQUIRED < 101300
+-                           #error message "GLib requires macOS 10.13 or later."
+-                           #endif''',
+-                         name : 'macOS 10.13 or later')
+-    error('GLib requires macOS 10.13 or later.')
+-  endif
+ 
+   # Mac OS X Carbon support
+   glib_have_carbon = objcc.compiles('''#include <Carbon/Carbon.h>
+@@ -1033,7 +1030,7 @@ if host_system == 'darwin' and subsystem
                                        #error "Detected GNUstep, not Cocoa"
                                        #endif''',
                                     name : 'Mac OS X Cocoa support')
@@ -52,7 +66,7 @@ $NetBSD: patch-meson.build,v 1.25 2025/0
    if glib_have_cocoa
      glib_conf.set('HAVE_COCOA', true)
      osx_ldflags += ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
-@@ -2379,18 +2383,17 @@ if host_system != 'windows' and get_opti
+@@ -2402,18 +2399,17 @@ if host_system != 'windows' and get_opti
  
    # try glibc
    if cc.has_function('getxattr') and cc.has_header('sys/xattr.h')
@@ -73,7 +87,7 @@ $NetBSD: patch-meson.build,v 1.25 2025/0
    if cc.compiles(glib_conf_prefix + '''
                   #include <stdio.h>
                   #ifdef HAVE_SYS_TYPES_H
-@@ -2491,7 +2494,7 @@ endif
+@@ -2514,7 +2510,7 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
@@ -82,7 +96,7 @@ $NetBSD: patch-meson.build,v 1.25 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 +2513,7 @@ python_test_libraries_built = meson.proj
+@@ -2553,7 +2549,7 @@ endif
  
  # Determine which user environment-dependent files that we want to install
  bash = find_program('bash', required : false)