CVS commit: pkgsrc/devel/glib2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 31 10:11:38 UTC 2021

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

Log Message:
glib2: use upstream version of fix for ghostutils.c


To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 pkgsrc/devel/glib2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/glib2/patches/patch-glib_ghostutils.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.283 pkgsrc/devel/glib2/distinfo:1.284
--- pkgsrc/devel/glib2/distinfo:1.283   Wed Mar 31 09:59:43 2021
+++ pkgsrc/devel/glib2/distinfo Wed Mar 31 10:11:38 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.283 2021/03/31 09:59:43 jperkin Exp $
+$NetBSD: distinfo,v 1.284 2021/03/31 10:11:38 wiz Exp $
 
 SHA1 (glib-2.68.0.tar.xz) = cd51b3d7c99ffbc9bb6b39fa6450fc147385c3cb
 RMD160 (glib-2.68.0.tar.xz) = 8843183c417ffe664a935d5ba229af4b5d8328bd
@@ -18,12 +18,12 @@ SHA1 (patch-gio_tests_meson.build) = 38f
 SHA1 (patch-glib_gatomic.c) = deb2e74010523ad41ce141aa2f49b807ba2672e6
 SHA1 (patch-glib_gatomic.h) = d1c39c3594a5c89d196349e5eafb5512795f55f8
 SHA1 (patch-glib_genviron.c) = dd25be36536d56dfe933225d785eb65f753c4a97
-SHA1 (patch-glib_ghostutils.c) = 3ec5111e720ae575c77df1fc483fa4cad63ebd65
+SHA1 (patch-glib_ghostutils.c) = bbeb3500e3d1e269ae56e8fd6a9c2381df701651
 SHA1 (patch-glib_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
 SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
 SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
-SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4
+SHA1 (patch-glib_tests_meson.build) = d358bd579eb09655c608106092bdeed8f16ff4d0
 SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
 SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
 SHA1 (patch-meson.build) = f186c7e8ab2c5ba779a1227ae75b15adc0ea17f9

Index: pkgsrc/devel/glib2/patches/patch-glib_ghostutils.c
diff -u pkgsrc/devel/glib2/patches/patch-glib_ghostutils.c:1.1 pkgsrc/devel/glib2/patches/patch-glib_ghostutils.c:1.2
--- pkgsrc/devel/glib2/patches/patch-glib_ghostutils.c:1.1      Wed Mar 31 09:59:43 2021
+++ pkgsrc/devel/glib2/patches/patch-glib_ghostutils.c  Wed Mar 31 10:11:38 2021
@@ -1,28 +1,15 @@
-$NetBSD: patch-glib_ghostutils.c,v 1.1 2021/03/31 09:59:43 jperkin Exp $
+$NetBSD: patch-glib_ghostutils.c,v 1.2 2021/03/31 10:11:38 wiz Exp $
 
-Test G_OS_UNIX after it has been defined.
+Include glibconfig.h to get the G_OS_UNIX token
+https://gitlab.gnome.org/GNOME/glib/-/commit/1fafbb82b0049dc76a72ebaeccda46db7166e7f2
 
 --- glib/ghostutils.c.orig     2021-03-18 13:28:31.903625000 +0000
 +++ glib/ghostutils.c
-@@ -21,10 +21,6 @@
+@@ -18,6 +18,7 @@
+  */
  
- #include <string.h>
- 
--#ifdef G_OS_UNIX
--#include <unistd.h>
--#endif
--
- #include "ghostutils.h"
+ #include "config.h"
++#include "glibconfig.h"
  
- #include "garray.h"
-@@ -33,6 +29,10 @@
- #include "gstrfuncs.h"
- #include "glibintl.h"
+ #include <string.h>
  
-+#ifdef G_OS_UNIX
-+#include <unistd.h>
-+#endif
-+
- #ifdef G_PLATFORM_WIN32
- #include <windows.h>
- #endif