Tue Nov 26 10:27:09 2019 UTC ()
glib2: Various fixes for the SunOS build.

Should also fix a bunch of other platforms, the build tries to execute a python
script that is not executable after unpacking the distfile, though not sure why
that's not showing up on some other bulk builds.


(jperkin)
diff -r1.263 -r1.264 pkgsrc/devel/glib2/Makefile
diff -r1.258 -r1.259 pkgsrc/devel/glib2/distinfo
diff -r1.2 -r1.3 pkgsrc/devel/glib2/patches/patch-glib_gmain.c
diff -r1.5 -r1.6 pkgsrc/devel/glib2/patches/patch-glib_meson.build
diff -r0 -r1.3 pkgsrc/devel/glib2/patches/patch-glib_tests_include.c
cvs diff -r1.263 -r1.264 pkgsrc/devel/glib2/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/glib2/Makefile 2019/11/14 11:40:30 1.263
+++ pkgsrc/devel/glib2/Makefile 2019/11/26 10:27:09 1.264
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1# $NetBSD: Makefile,v 1.263 2019/11/14 11:40:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.264 2019/11/26 10:27:09 jperkin Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5CATEGORIES= devel gnome 5CATEGORIES= devel gnome
6COMMENT= Some useful routines for C programming (glib2) 6COMMENT= Some useful routines for C programming (glib2)
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10MESON_ARGS+= -Dinstalled_tests=false 10MESON_ARGS+= -Dinstalled_tests=false
11# Avoid linux dependency on libmount-dev 11# Avoid linux dependency on libmount-dev
12MESON_ARGS+= -Dlibmount=false 12MESON_ARGS+= -Dlibmount=false
13 13
14MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/output/gobject:${WRKSRC}/output/gmodule 14MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gio:${WRKSRC}/output/glib:${WRKSRC}/output/gobject:${WRKSRC}/output/gmodule
15 15
16LDFLAGS.SunOS+= -lintl -lnsl 16LDFLAGS.SunOS+= -liconv -lintl -lnsl -lsocket
17 17
18REPLACE_PYTHON+= gio/gio-querymodules-wrapper.py 18REPLACE_PYTHON+= gio/gio-querymodules-wrapper.py
19REPLACE_PYTHON+= gio/tests/gengiotypefuncs.py 19REPLACE_PYTHON+= gio/tests/gengiotypefuncs.py
20REPLACE_PYTHON+= gio/tests/static-link.py 20REPLACE_PYTHON+= gio/tests/static-link.py
21REPLACE_PYTHON+= glib/update-gtranslit.py 21REPLACE_PYTHON+= glib/update-gtranslit.py
22REPLACE_PYTHON+= gobject/tests/mkenums.py 22REPLACE_PYTHON+= gobject/tests/mkenums.py
23REPLACE_PYTHON+= tests/gen-casefold-txt.py 23REPLACE_PYTHON+= tests/gen-casefold-txt.py
24REPLACE_PYTHON+= tests/gen-casemap-txt.py 24REPLACE_PYTHON+= tests/gen-casemap-txt.py
25 25
26FILES_SUBST+= GIO_MODULES_DIR=${PREFIX}/lib/gio/modules 26FILES_SUBST+= GIO_MODULES_DIR=${PREFIX}/lib/gio/modules
27FILES_SUBST+= GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules 27FILES_SUBST+= GIO_QUERYMODULES=${PREFIX}/bin/gio-querymodules
28FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas 28FILES_SUBST+= GLIB_COMPILE_SCHEMAS=${PREFIX}/bin/glib-compile-schemas
29FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas 29FILES_SUBST+= GLIB_SCHEMAS_DIR=${PREFIX}/share/glib-2.0/schemas
@@ -52,21 +52,24 @@ PKGCONFIG_OVERRIDE+= output/meson-privat @@ -52,21 +52,24 @@ PKGCONFIG_OVERRIDE+= output/meson-privat
52PKGCONFIG_OVERRIDE+= output/meson-private/glib-2.0.pc 52PKGCONFIG_OVERRIDE+= output/meson-private/glib-2.0.pc
53PKGCONFIG_OVERRIDE+= output/meson-private/gmodule-2.0.pc 53PKGCONFIG_OVERRIDE+= output/meson-private/gmodule-2.0.pc
54PKGCONFIG_OVERRIDE+= output/meson-private/gmodule-export-2.0.pc 54PKGCONFIG_OVERRIDE+= output/meson-private/gmodule-export-2.0.pc
55PKGCONFIG_OVERRIDE+= output/meson-private/gmodule-no-export-2.0.pc 55PKGCONFIG_OVERRIDE+= output/meson-private/gmodule-no-export-2.0.pc
56PKGCONFIG_OVERRIDE+= output/meson-private/gobject-2.0.pc 56PKGCONFIG_OVERRIDE+= output/meson-private/gobject-2.0.pc
57PKGCONFIG_OVERRIDE+= output/meson-private/gthread-2.0.pc 57PKGCONFIG_OVERRIDE+= output/meson-private/gthread-2.0.pc
58 58
59PKGCONFIG_OVERRIDE_STAGE= post-configure 59PKGCONFIG_OVERRIDE_STAGE= post-configure
60 60
61# to run gdbus-codegen to generate gdbus-daemon-generated.{h,c} 61# to run gdbus-codegen to generate gdbus-daemon-generated.{h,c}
62TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 62TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
63PYTHON_FOR_BUILD_ONLY= yes 63PYTHON_FOR_BUILD_ONLY= yes
64 64
 65post-extract:
 66 ${CHMOD} +x ${WRKSRC}/gio/tests/gengiotypefuncs.py
 67
65.include "../../converters/libiconv/buildlink3.mk" 68.include "../../converters/libiconv/buildlink3.mk"
66.include "../../devel/gettext-lib/buildlink3.mk" 69.include "../../devel/gettext-lib/buildlink3.mk"
67.include "../../devel/pcre/buildlink3.mk" 70.include "../../devel/pcre/buildlink3.mk"
68.include "../../devel/meson/build.mk" 71.include "../../devel/meson/build.mk"
69.include "../../devel/libffi/buildlink3.mk" 72.include "../../devel/libffi/buildlink3.mk"
70.include "../../devel/zlib/buildlink3.mk" 73.include "../../devel/zlib/buildlink3.mk"
71.include "../../lang/python/application.mk" 74.include "../../lang/python/application.mk"
72.include "../../mk/bsd.pkg.mk" 75.include "../../mk/bsd.pkg.mk"
cvs diff -r1.258 -r1.259 pkgsrc/devel/glib2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/glib2/distinfo 2019/11/14 12:26:05 1.258
+++ pkgsrc/devel/glib2/distinfo 2019/11/26 10:27:09 1.259
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1$NetBSD: distinfo,v 1.258 2019/11/14 12:26:05 ryoon Exp $ 1$NetBSD: distinfo,v 1.259 2019/11/26 10:27:09 jperkin Exp $
2 2
3SHA1 (glib-2.62.2.tar.xz) = b2a4e6eea3132b4c8393c2f570711131ed960b73 3SHA1 (glib-2.62.2.tar.xz) = b2a4e6eea3132b4c8393c2f570711131ed960b73
4RMD160 (glib-2.62.2.tar.xz) = 4a2cb690579c755de38125081879633e739a3820 4RMD160 (glib-2.62.2.tar.xz) = 4a2cb690579c755de38125081879633e739a3820
5SHA512 (glib-2.62.2.tar.xz) = 9261d1ed8b1b6479328f95e1e5ed70e15472967171bdf3906c63744b93e9b1e8f003d5198e90bf2a6548e89fd6ec091d2daa2683a113a167a9d40066b89e9330 5SHA512 (glib-2.62.2.tar.xz) = 9261d1ed8b1b6479328f95e1e5ed70e15472967171bdf3906c63744b93e9b1e8f003d5198e90bf2a6548e89fd6ec091d2daa2683a113a167a9d40066b89e9330
6Size (glib-2.62.2.tar.xz) = 4682000 bytes 6Size (glib-2.62.2.tar.xz) = 4682000 bytes
7SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281 7SHA1 (patch-gio_gcredentialsprivate.h) = dab92e07f8357a7dc1a569e37f65f9b199aee281
8SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4 8SHA1 (patch-gio_gdbus-2.0_codegen_meson.build) = ec8ce89da08059ebf953d84a1dca5a2b380349f4
9SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed 9SHA1 (patch-gio_giomodule.c) = d704699b2f457a08fff9219fe697e5fd2cc582ed
10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc 10SHA1 (patch-gio_gresource-tool.c) = ad0e59f48f5f98ea66be568dbe2e5a5d1ac602fc
11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312 11SHA1 (patch-gio_gunixcredentialsmessage.c) = c13119ddd6262db7c03e53857e987f0c495d3312
12SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d 12SHA1 (patch-gio_gunixmounts.c) = 13af07fffe898457edd0d8db4296a60fccba913d
13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4 13SHA1 (patch-gio_inotify_inotify-kernel.c) = 78544b4c32ef3b44e8721b1c07407f46a9e8c8a4
14SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f 14SHA1 (patch-gio_meson.build) = c2bda4943f8580706ec45760604ed1bdf63d1c6f
15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a 15SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
16SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8 16SHA1 (patch-glib_gatomic.c) = 875ad9c828dcf2add356d4988d14fb4f1985aef8
17SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1 17SHA1 (patch-glib_gatomic.h) = 21294cac483c3379198283c54fe6e24af3e630b1
18SHA1 (patch-glib_glibconfig.h.in) = 1964b5fb15317e681dad426d4862e3f48c4274f7 18SHA1 (patch-glib_glibconfig.h.in) = 1964b5fb15317e681dad426d4862e3f48c4274f7
19SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d 19SHA1 (patch-glib_gmain.c) = b361e4f7fa285c1d9317468c2b1be390e8190e8b
20SHA1 (patch-glib_gtypes.h) = a659b770c55a8071a6e6afd8a9fccdf723e086e6 20SHA1 (patch-glib_gtypes.h) = a659b770c55a8071a6e6afd8a9fccdf723e086e6
21SHA1 (patch-glib_meson.build) = f7990bc0a37c0d14437c7bbd44b1e60dd1f8245e 21SHA1 (patch-glib_meson.build) = bc429f6537c6dd5fa99137c35c0627a97d48a850
22SHA1 (patch-glib_tests_hash.c) = e928b22926ad917a7a201882a5105b25533554ae 22SHA1 (patch-glib_tests_hash.c) = e928b22926ad917a7a201882a5105b25533554ae
 23SHA1 (patch-glib_tests_include.c) = 12d98caebfb87c1146821d518c37c45f97fc7be0
23SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4 24SHA1 (patch-glib_tests_meson.build) = d012ede92bd3202bde4e8fab9cf4c0ee9ca8d3d4
24SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8 25SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8
25SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4 26SHA1 (patch-gmodule_gmodule-dl.c) = b678a04debbc79ebb67d91db7716990658e76da4
26SHA1 (patch-gmodule_gmodule-dyld.c) = 5adf62970d9cff22d451307aaa0b00d975dab138 27SHA1 (patch-gmodule_gmodule-dyld.c) = 5adf62970d9cff22d451307aaa0b00d975dab138
27SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd 28SHA1 (patch-gmodule_gmodule-win32.c) = 477a861f8590a62c3dbc0aa4ad728cc86ebb34dd
28SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a 29SHA1 (patch-gmodule_gmodule.c) = 55c5f9d16e3517f3fdc04d40922f50d9c66b0b9a
29SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d 30SHA1 (patch-gobject_glib-mkenums.in) = c177cf9b1ea81542665240678f47f68351a3760d
30SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d 31SHA1 (patch-gobject_meson.build) = 412b65558aa4cf9648ee84a57ad6dfcc988b1a1d
31SHA1 (patch-meson.build) = 2f72a332c23063c8654d47af79593eb4cc6a8c4d 32SHA1 (patch-meson.build) = 2f72a332c23063c8654d47af79593eb4cc6a8c4d
32SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54 33SHA1 (patch-meson_options.txt) = 7f633fbbfa9d9b2d958365891ffb9e4094d7dd54
cvs diff -r1.2 -r1.3 pkgsrc/devel/glib2/patches/Attic/patch-glib_gmain.c (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/Attic/patch-glib_gmain.c 2019/06/03 09:53:50 1.2
+++ pkgsrc/devel/glib2/patches/Attic/patch-glib_gmain.c 2019/11/26 10:27:09 1.3
@@ -1,77 +1,75 @@ @@ -1,77 +1,75 @@
1$NetBSD: patch-glib_gmain.c,v 1.2 2019/06/03 09:53:50 prlw1 Exp $ 1$NetBSD: patch-glib_gmain.c,v 1.3 2019/11/26 10:27:09 jperkin Exp $
2 2
3Imported patch from the upstream Bugzilla: 3Imported patch from the upstream Bugzilla:
4 4
5 Bug 728123 - glib2 @2.40.0 issues a "Got weird mach timebase info" error (Macports, PPC) 5 Bug 728123 - glib2 @2.40.0 issues a "Got weird mach timebase info" error (Macports, PPC)
6 https://gitlab.gnome.org/GNOME/glib/issues/858 6 https://gitlab.gnome.org/GNOME/glib/issues/858
7 7
8Tested on powerpc-apple-darwin9. 8Tested on powerpc-apple-darwin9.
9 9
10--- glib/gmain.c.orig 2014-11-09 21:54:26.000000000 +0000 10--- glib/gmain.c.orig 2019-10-21 17:18:40.000000000 +0000
11+++ glib/gmain.c 11+++ glib/gmain.c
12@@ -2694,47 +2694,31 @@ g_get_monotonic_time (void) 12@@ -2758,47 +2758,31 @@ g_get_monotonic_time (void)
13 gint64 13 gint64
14 g_get_monotonic_time (void) 14 g_get_monotonic_time (void)
15 { 15 {
16- static mach_timebase_info_data_t timebase_info; 16- static mach_timebase_info_data_t timebase_info;
17+ mach_timebase_info_data_t timebase_info; 17+ mach_timebase_info_data_t timebase_info;
18+ guint64 val; 18+ guint64 val;
19  19
20- if (timebase_info.denom == 0) 20- if (timebase_info.denom == 0)
21- { 21- {
22- /* This is a fraction that we must use to scale 22- /* This is a fraction that we must use to scale
23- * mach_absolute_time() by in order to reach nanoseconds. 23- * mach_absolute_time() by in order to reach nanoseconds.
24- * 24- *
25- * We've only ever observed this to be 1/1, but maybe it could be 25- * We've only ever observed this to be 1/1, but maybe it could be
26- * 1000/1 if mach time is microseconds already, or 1/1000 if 26- * 1000/1 if mach time is microseconds already, or 1/1000 if
27- * picoseconds. Try to deal nicely with that. 27- * picoseconds. Try to deal nicely with that.
28- */ 28- */
29- mach_timebase_info (&timebase_info); 29- mach_timebase_info (&timebase_info);
30- 30+ /* we get nanoseconds from mach_absolute_time() using timebase_info */
 31+ mach_timebase_info (&timebase_info);
 32+ val = mach_absolute_time();
 33
31- /* We actually want microseconds... */ 34- /* We actually want microseconds... */
32- if (timebase_info.numer % 1000 == 0) 35- if (timebase_info.numer % 1000 == 0)
33- timebase_info.numer /= 1000; 36- timebase_info.numer /= 1000;
34- else 37- else
35- timebase_info.denom *= 1000; 38- timebase_info.denom *= 1000;
36- 39+ if (timebase_info.numer != timebase_info.denom)
 40+ {
 41+ guint64 t_high, t_low;
 42+ guint64 result_high, result_low;
 43
37- /* We want to make the numer 1 to avoid having to multiply... */ 44- /* We want to make the numer 1 to avoid having to multiply... */
38- if (timebase_info.denom % timebase_info.numer == 0) 45- if (timebase_info.denom % timebase_info.numer == 0)
39- { 46- {
40- timebase_info.denom /= timebase_info.numer; 47- timebase_info.denom /= timebase_info.numer;
41- timebase_info.numer = 1; 48- timebase_info.numer = 1;
42- } 49- }
43- else 50- else
44- { 51- {
45- /* We could just multiply by timebase_info.numer below, but why 52- /* We could just multiply by timebase_info.numer below, but why
46- * bother for a case that may never actually exist... 53- * bother for a case that may never actually exist...
47- * 54- *
48- * Plus -- performing the multiplication would risk integer 55- * Plus -- performing the multiplication would risk integer
49- * overflow. If we ever actually end up in this situation, we 56- * overflow. If we ever actually end up in this situation, we
50- * should more carefully evaluate the correct course of action. 57- * should more carefully evaluate the correct course of action.
51- */ 58- */
52- mach_timebase_info (&timebase_info); /* Get a fresh copy for a better message */ 59- mach_timebase_info (&timebase_info); /* Get a fresh copy for a better message */
53- g_error ("Got weird mach timebase info of %d/%d. Please file a bug against GLib.", 60- g_error ("Got weird mach timebase info of %d/%d. Please file a bug against GLib.",
54- timebase_info.numer, timebase_info.denom); 61- timebase_info.numer, timebase_info.denom);
55- } 62- }
56+ /* we get nanoseconds from mach_absolute_time() using timebase_info */ 
57+ mach_timebase_info (&timebase_info); 
58+ val = mach_absolute_time(); 
59+ 
60+ if (timebase_info.numer != timebase_info.denom) 
61+ { 
62+ guint64 t_high, t_low; 
63+ guint64 result_high, result_low; 
64+ 
65+ /* 64 bit x 32 bit / 32 bit with 96-bit intermediate  63+ /* 64 bit x 32 bit / 32 bit with 96-bit intermediate
66+ * algorithm lifted from qemu */ 64+ * algorithm lifted from qemu */
67+ t_low = (val & 0xffffffffLL) * (guint64)timebase_info.numer; 65+ t_low = (val & 0xffffffffLL) * (guint64)timebase_info.numer;
68+ t_high = (val >> 32) * (guint64)timebase_info.numer; 66+ t_high = (val >> 32) * (guint64)timebase_info.numer;
69+ t_high += (t_low >> 32); 67+ t_high += (t_low >> 32);
70+ result_high = t_high / (guint64)timebase_info.denom; 68+ result_high = t_high / (guint64)timebase_info.denom;
71+ result_low = (((t_high % (guint64)timebase_info.denom) << 32) + 69+ result_low = (((t_high % (guint64)timebase_info.denom) << 32) +
72+ (t_low & 0xffffffff)) / (guint64)timebase_info.denom; 70+ (t_low & 0xffffffff)) / (guint64)timebase_info.denom;
73+ val = ((result_high << 32) | result_low); 71+ val = ((result_high << 32) | result_low);
74 } 72 }
75  73
76- return mach_absolute_time () / timebase_info.denom; 74- return mach_absolute_time () / timebase_info.denom;
77+ /* nanoseconds to microseconds */ 75+ /* nanoseconds to microseconds */
cvs diff -r1.5 -r1.6 pkgsrc/devel/glib2/patches/patch-glib_meson.build (expand / switch to unified diff)

--- pkgsrc/devel/glib2/patches/patch-glib_meson.build 2019/11/14 11:40:30 1.5
+++ pkgsrc/devel/glib2/patches/patch-glib_meson.build 2019/11/26 10:27:09 1.6
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1$NetBSD: patch-glib_meson.build,v 1.5 2019/11/14 11:40:30 wiz Exp $ 1$NetBSD: patch-glib_meson.build,v 1.6 2019/11/26 10:27:09 jperkin Exp $
2 2
3- On Darwin, allow building without Cocoa. 3- On Darwin, allow building without Cocoa.
4- Don't bother with gtester as it's slated for deprecation anyway: 4- Don't bother with gtester as it's slated for deprecation anyway:
5 https://gitlab.gnome.org/GNOME/glib/issues/1441 5 https://gitlab.gnome.org/GNOME/glib/issues/1441
6 6
7--- glib/meson.build.orig 2019-10-04 11:44:24.000000000 +0000 7--- glib/meson.build.orig 2019-10-21 17:18:40.000000000 +0000
8+++ glib/meson.build 8+++ glib/meson.build
9@@ -316,7 +316,7 @@ else 9@@ -316,7 +316,7 @@ else
10 platform_deps = [] 10 platform_deps = []
11 endif 11 endif
12  12
13-if host_system == 'darwin' 13-if host_system == 'darwin'
14+if host_system == 'darwin' and glib_have_cocoa 14+if host_system == 'darwin' and glib_have_cocoa
15 glib_sources += files('gosxutils.m') 15 glib_sources += files('gosxutils.m')
16 endif 16 endif
17  17
18@@ -410,25 +410,8 @@ if host_system == 'windows' 18@@ -410,24 +410,7 @@ if host_system == 'windows'
19 include_directories : configinc, 19 include_directories : configinc,
20 dependencies : [libglib_dep]) 20 dependencies : [libglib_dep])
21 endif 21 endif
22-else 22-else
23- gtester = executable('gtester', 'gtester.c', 23- gtester = executable('gtester', 'gtester.c',
24- install : true, 24- install : true,
25- c_args : ['-UG_DISABLE_ASSERT'], 25- c_args : ['-UG_DISABLE_ASSERT'],
26- include_directories : configinc, 26- include_directories : configinc,
27- dependencies : [libglib_dep]) 27- dependencies : [libglib_dep])
28 endif 28-endif
29  29-
30-report_conf = configuration_data() 30-report_conf = configuration_data()
31-report_conf.set('GLIB_VERSION', glib_version) 31-report_conf.set('GLIB_VERSION', glib_version)
32-report_conf.set('PYTHON', python_name) 32-report_conf.set('PYTHON', python_name)
33-configure_file( 33-configure_file(
34- input: 'gtester-report.in', 34- input: 'gtester-report.in',
35- output: 'gtester-report', 35- output: 'gtester-report',
36- install_dir: get_option('bindir'), 36- install_dir: get_option('bindir'),
37- configuration: report_conf, 37- configuration: report_conf,
38- install_mode: 'rwxr-xr-x' 38- install_mode: 'rwxr-xr-x'
39-) 39-)
40- 40+endif
 41
41 install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb')) 42 install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
42  43
43 gdb_conf = configuration_data() 
File Added: pkgsrc/devel/glib2/patches/patch-glib_tests_include.c
$NetBSD: patch-glib_tests_include.c,v 1.3 2019/11/26 10:27:09 jperkin Exp $

Fix SunOS build.

--- glib/tests/include.c.orig	2019-10-21 17:18:40.000000000 +0000
+++ glib/tests/include.c
@@ -1,8 +1,10 @@
 /* Test case for bug 659866 */
 
+#ifndef __sun
 #define _POSIX_C_SOURCE 199309L
 #undef _GNU_SOURCE
 #undef _XOPEN_SOURCE
+#endif
 #include <pthread.h>
 #include <glib.h>