CVS commit: pkgsrc/devel/glib2

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Jun 30 13:08:37 UTC 2023

Modified Files:
        pkgsrc/devel/glib2: distinfo
        pkgsrc/devel/glib2/patches: patch-gio_giomodule.c

Log Message:
devel/glib2: Fix build on macOS without cocoa option.


To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/glib2/patches/patch-gio_giomodule.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/distinfo
diff -u pkgsrc/devel/glib2/distinfo:1.310 pkgsrc/devel/glib2/distinfo:1.311
--- pkgsrc/devel/glib2/distinfo:1.310   Mon Jun 26 19:25:56 2023
+++ pkgsrc/devel/glib2/distinfo Fri Jun 30 13:08:37 2023
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.310 2023/06/26 19:25:56 adam Exp $
+$NetBSD: distinfo,v 1.311 2023/06/30 13:08:37 riastradh Exp $
 
 BLAKE2s (glib-2.76.3.tar.xz) = c3f1e917538c736a42ca9a11490d5c1bb2931cbbf88ef5870ba6a933c6d314dc
 SHA512 (glib-2.76.3.tar.xz) = 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e
 Size (glib-2.76.3.tar.xz) = 5273460 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = f719ae41a9eb1d2f04d866b246fa5176543f2df9
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 76ed9658ac11fb33b97143938b6a60b5aa515cae
-SHA1 (patch-gio_giomodule.c) = 68e612ac178c41aa0aae2bd66c3e4263910711ac
+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

Index: pkgsrc/devel/glib2/patches/patch-gio_giomodule.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.7 pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.8
--- pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.7        Mon Oct 11 10:03:47 2021
+++ pkgsrc/devel/glib2/patches/patch-gio_giomodule.c    Fri Jun 30 13:08:37 2023
@@ -1,10 +1,20 @@
-$NetBSD: patch-gio_giomodule.c,v 1.7 2021/10/11 10:03:47 cirnatdan Exp $
+$NetBSD: patch-gio_giomodule.c,v 1.8 2023/06/30 13:08:37 riastradh Exp $
 
+Make Cocoa notification backend conditional.
 Disable inotify on SunOS.
 
---- gio/giomodule.c.orig       2021-09-17 10:17:56.682960300 +0000
+--- gio/giomodule.c.orig       2023-05-23 10:55:59.000000000 +0000
 +++ gio/giomodule.c
-@@ -1280,7 +1280,7 @@ _g_io_modules_ensure_loaded (void)
+@@ -1105,7 +1105,7 @@ extern GType g_proxy_resolver_portal_get
+ extern GType g_network_monitor_portal_get_type (void);
+ #endif
+ 
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
++#if defined(HAVE_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ extern GType g_cocoa_notification_backend_get_type (void);
+ #endif
+ 
+@@ -1346,7 +1346,7 @@ _g_io_modules_ensure_loaded (void)
        g_type_ensure (g_memory_settings_backend_get_type ());
        g_type_ensure (g_keyfile_settings_backend_get_type ());
        g_type_ensure (g_power_profile_monitor_dbus_get_type ());
@@ -13,3 +23,12 @@ Disable inotify on SunOS.
        g_type_ensure (g_inotify_file_monitor_get_type ());
  #endif
  #if defined(HAVE_KQUEUE)
+@@ -1373,7 +1373,7 @@ _g_io_modules_ensure_loaded (void)
+       g_type_ensure (g_power_profile_monitor_portal_get_type ());
+       g_type_ensure (g_proxy_resolver_portal_get_type ());
+ #endif
+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
++#if defined(HAVE_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+       g_type_ensure (g_cocoa_notification_backend_get_type ());
+ #endif
+ #ifdef G_OS_WIN32