diff options
author | wiz <wiz@pkgsrc.org> | 2021-03-31 10:11:38 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2021-03-31 10:11:38 +0000 |
commit | 36be28108d0999df75ebc2b2df2689628fcc53fc (patch) | |
tree | 71a70ace2e65b9fe28e3c1458cdf977fc88ab3c7 /devel/glib2/patches | |
parent | 3ee7a2b0ce80a029118845b248da5db0a2ec2334 (diff) | |
download | pkgsrc-36be28108d0999df75ebc2b2df2689628fcc53fc.tar.gz |
glib2: use upstream version of fix for ghostutils.c
Diffstat (limited to 'devel/glib2/patches')
-rw-r--r-- | devel/glib2/patches/patch-glib_ghostutils.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/devel/glib2/patches/patch-glib_ghostutils.c b/devel/glib2/patches/patch-glib_ghostutils.c index 6da8a2b26df..cac677de8f1 100644 --- a/devel/glib2/patches/patch-glib_ghostutils.c +++ b/devel/glib2/patches/patch-glib_ghostutils.c @@ -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 |