CVS commit: pkgsrc/devel/glib2

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jun  5 08:57:15 UTC 2019

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

Log Message:
glib2: Disable inotify support on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/glib2/patches/patch-gio_giomodule.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-gio_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.241 pkgsrc/devel/glib2/distinfo:1.242
--- pkgsrc/devel/glib2/distinfo:1.241   Tue Jun  4 10:24:21 2019
+++ pkgsrc/devel/glib2/distinfo Wed Jun  5 08:57:15 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.241 2019/06/04 10:24:21 maya Exp $
+$NetBSD: distinfo,v 1.242 2019/06/05 08:57:15 jperkin Exp $
 
 SHA1 (glib-2.60.2.tar.xz) = 8aa8586f0b1fd13c2717adf7ac3e6427bee651b6
 RMD160 (glib-2.60.2.tar.xz) = 8d18a8e4b43071afc35762eff3618a88a7112f57
@@ -6,13 +6,13 @@ SHA512 (glib-2.60.2.tar.xz) = 38479c8e48
 Size (glib-2.60.2.tar.xz) = 4587388 bytes
 SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
 SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = 21c806f1a9884000b6a1683bc2fd1276b3c3544f
-SHA1 (patch-gio_giomodule.c) = 08181ad8d46dde1a028faa246a4852e474610eaa
+SHA1 (patch-gio_giomodule.c) = 7f9fa22bebce1c29cdb1dfe7e7b11d92a3f463dd
 SHA1 (patch-gio_glocalfileinfo.c) = 8e0b7e9543ce3c702c468f56e7ecf418d70b049f
 SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
 SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
 SHA1 (patch-gio_gunixmounts.c) = 5c9d4d86161ef1723da0e7d54af65debcb1ed137
 SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f23b84
-SHA1 (patch-gio_meson.build) = 5983ff37da260558d0f367feed75d4c0ed1bd6fd
+SHA1 (patch-gio_meson.build) = 745b0b2047537a16f0f4f5dd5eeaebf29844e8e1
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
 SHA1 (patch-glib_meson.build) = 477cbc2324a81bb2a406487daef71cfc2140719c
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8

Index: pkgsrc/devel/glib2/patches/patch-gio_giomodule.c
diff -u pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.3 pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.4
--- pkgsrc/devel/glib2/patches/patch-gio_giomodule.c:1.3        Mon May 21 08:39:38 2018
+++ pkgsrc/devel/glib2/patches/patch-gio_giomodule.c    Wed Jun  5 08:57:15 2019
@@ -1,8 +1,9 @@
-$NetBSD: patch-gio_giomodule.c,v 1.3 2018/05/21 08:39:38 jperkin Exp $
+$NetBSD: patch-gio_giomodule.c,v 1.4 2019/06/05 08:57:15 jperkin Exp $
 
 Re-enable gdesktopappinfo on Darwin.
+Disable inotify on SunOS.
 
---- gio/giomodule.c.orig       2017-06-22 12:52:49.000000000 +0000
+--- gio/giomodule.c.orig       2019-05-03 13:43:28.000000000 +0000
 +++ gio/giomodule.c
 @@ -43,12 +43,9 @@
  #endif
@@ -18,7 +19,7 @@ Re-enable gdesktopappinfo on Darwin.
  
  #ifdef HAVE_COCOA
  #include <AvailabilityMacros.h>
-@@ -978,7 +975,7 @@ _g_io_modules_ensure_extension_points_re
+@@ -1084,7 +1081,7 @@ _g_io_modules_ensure_extension_points_re
      {
        registered_extensions = TRUE;
        
@@ -27,7 +28,16 @@ Re-enable gdesktopappinfo on Darwin.
  #if !GLIB_CHECK_VERSION (3, 0, 0)
        ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME);
        G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-@@ -1119,7 +1116,6 @@ _g_io_modules_ensure_loaded (void)
+@@ -1209,7 +1206,7 @@ _g_io_modules_ensure_loaded (void)
+       /* Initialize types from built-in "modules" */
+       g_type_ensure (g_null_settings_backend_get_type ());
+       g_type_ensure (g_memory_settings_backend_get_type ());
+-#if defined(HAVE_INOTIFY_INIT1)
++#if defined(HAVE_INOTIFY_INIT1) && !defined(__sun)
+       g_type_ensure (g_inotify_file_monitor_get_type ());
+ #endif
+ #if defined(HAVE_KQUEUE)
+@@ -1225,7 +1222,6 @@ _g_io_modules_ensure_loaded (void)
  #endif
  #ifdef HAVE_COCOA
        g_type_ensure (g_nextstep_settings_backend_get_type ());

Index: pkgsrc/devel/glib2/patches/patch-gio_meson.build
diff -u pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.1 pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.2
--- pkgsrc/devel/glib2/patches/patch-gio_meson.build:1.1        Mon Jun  3 09:53:50 2019
+++ pkgsrc/devel/glib2/patches/patch-gio_meson.build    Wed Jun  5 08:57:15 2019
@@ -1,9 +1,19 @@
-$NetBSD: patch-gio_meson.build,v 1.1 2019/06/03 09:53:50 prlw1 Exp $
+$NetBSD: patch-gio_meson.build,v 1.2 2019/06/05 08:57:15 jperkin Exp $
 
 Don't build tests, as have strong dependency on libdl.
+Disable inotify on SunOS.
 
 --- gio/meson.build.orig       2019-05-03 13:43:28.000000000 +0000
 +++ gio/meson.build
+@@ -758,7 +758,7 @@ gioenumtypes_c = custom_target('gioenumt
+ gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_h])
+ 
+ # inotify
+-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'
+   subdir('inotify')
+   internal_deps += [ inotify_lib ]
+   internal_objects += [inotify_lib.extract_all_objects()]
 @@ -994,4 +994,3 @@ if enable_systemtap
  endif