[pkgsrc/trunk]: pkgsrc/devel/glib2 glib2: Fix a couple of build issues.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6276d945f7ab
branches:  trunk
changeset: 449479:6276d945f7ab
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Mar 31 09:59:43 2021 +0000

description:
glib2: Fix a couple of build issues.

diffstat:

 devel/glib2/Makefile                        |   4 ++--
 devel/glib2/distinfo                        |   3 ++-
 devel/glib2/patches/patch-glib_ghostutils.c |  28 ++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diffs (67 lines):

diff -r d377702ddd10 -r 6276d945f7ab devel/glib2/Makefile
--- a/devel/glib2/Makefile      Wed Mar 31 09:52:41 2021 +0000
+++ b/devel/glib2/Makefile      Wed Mar 31 09:59:43 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.279 2021/03/30 20:34:10 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.280 2021/03/31 09:59:43 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -19,7 +19,7 @@
 
 MAKE_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/output/gobject:${WRKSRC}/output/gmodule
 
-CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
+CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -D__stub_epoll_create
 LDFLAGS.SunOS+=                -liconv -lintl -lnsl -lsocket
 LDFLAGS.FreeBSD+=      -liconv
 
diff -r d377702ddd10 -r 6276d945f7ab devel/glib2/distinfo
--- a/devel/glib2/distinfo      Wed Mar 31 09:52:41 2021 +0000
+++ b/devel/glib2/distinfo      Wed Mar 31 09:59:43 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.282 2021/03/30 09:37:51 cirnatdan Exp $
+$NetBSD: distinfo,v 1.283 2021/03/31 09:59:43 jperkin Exp $
 
 SHA1 (glib-2.68.0.tar.xz) = cd51b3d7c99ffbc9bb6b39fa6450fc147385c3cb
 RMD160 (glib-2.68.0.tar.xz) = 8843183c417ffe664a935d5ba229af4b5d8328bd
@@ -18,6 +18,7 @@
 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_gspawn.c) = 8f833edd594168fe62c5d0e161ebaafdebda2294
 SHA1 (patch-glib_meson.build) = 65cbe6e3bd650f8f2c37f003a48ef183700a6ef9
 SHA1 (patch-glib_tests_hash.c) = a7e19ca55fcbbc0b188c34755cae5b6b65b67f1a
diff -r d377702ddd10 -r 6276d945f7ab devel/glib2/patches/patch-glib_ghostutils.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/glib2/patches/patch-glib_ghostutils.c       Wed Mar 31 09:59:43 2021 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-glib_ghostutils.c,v 1.1 2021/03/31 09:59:43 jperkin Exp $
+
+Test G_OS_UNIX after it has been defined.
+
+--- glib/ghostutils.c.orig     2021-03-18 13:28:31.903625000 +0000
++++ glib/ghostutils.c
+@@ -21,10 +21,6 @@
+ 
+ #include <string.h>
+ 
+-#ifdef G_OS_UNIX
+-#include <unistd.h>
+-#endif
+-
+ #include "ghostutils.h"
+ 
+ #include "garray.h"
+@@ -33,6 +29,10 @@
+ #include "gstrfuncs.h"
+ #include "glibintl.h"
+ 
++#ifdef G_OS_UNIX
++#include <unistd.h>
++#endif
++
+ #ifdef G_PLATFORM_WIN32
+ #include <windows.h>
+ #endif