glib2 is built with USE_LANGUAGES c99, so size_t exists. Use it rather

than a type of the same size.
PR pkg/54298

4 files changed, 46 insertions, 3 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 8832f104535..3c44fb134be 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.254 2019/06/21 20:20:59 prlw1 Exp $
+# $NetBSD: Makefile,v 1.255 2019/06/25 10:57:28 prlw1 Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel gnome
 COMMENT=	Some useful routines for C programming (glib2)
 
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 219f008ff21..001052e6e56 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.248 2019/06/21 20:20:59 prlw1 Exp $
+$NetBSD: distinfo,v 1.249 2019/06/25 10:57:28 prlw1 Exp $
 
 SHA1 (glib-2.60.4.tar.xz) = f76ef7339fef5784d79520478110caa4c5054806
 RMD160 (glib-2.60.4.tar.xz) = e8520dd0da7c37e6bb18b24a3b3ec308a6fa6aa0
@@ -14,7 +14,9 @@ SHA1 (patch-gio_inotify_inotify-kernel.c) = 24deec33a1ad5e3c1a4f2d1397440d26b0f2
 SHA1 (patch-gio_meson.build) = a0dcda4e9d05ed83b7fb11102945821eea27b81d
 SHA1 (patch-gio_tests_gdbus-export.c) = 59d85ca079d02b52e33153c7d2ac1cc48c26707a
 SHA1 (patch-glib_ghash.c) = 938135c3a71199e61d1cd1dffa6e1d63864150d6
+SHA1 (patch-glib_glibconfig.h.in) = 1964b5fb15317e681dad426d4862e3f48c4274f7
 SHA1 (patch-glib_gmain.c) = 2ab4b59e438d9f764bee62e0c1fa8bbd231b6e8d
+SHA1 (patch-glib_gtypes.h) = d210d7a743821f3d36f198e952574a92b53db15d
 SHA1 (patch-glib_meson.build) = 119e48efd8aaabf06b62c6e1897261b470cf7355
 SHA1 (patch-glib_tests_hash.c) = e928b22926ad917a7a201882a5105b25533554ae
 SHA1 (patch-gmodule_gmodule-ar.c) = e382a0ada232e083d51cbede7f689a50ebeff4d8
diff --git a/devel/glib2/patches/patch-glib_glibconfig.h.in b/devel/glib2/patches/patch-glib_glibconfig.h.in
new file mode 100644
index 00000000000..7bcb6eeba9a
--- /dev/null
+++ b/devel/glib2/patches/patch-glib_glibconfig.h.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-glib_glibconfig.h.in,v 1.1 2019/06/25 10:57:28 prlw1 Exp $
+
+We insist on C99, so size_t exists => use it.
+PR pkg/54298
+
+--- glib/glibconfig.h.in.orig	2019-06-10 17:47:20.000000000 +0000
++++ glib/glibconfig.h.in
+@@ -74,12 +74,10 @@ typedef unsigned @gint32@ guint32;
+ #define GLIB_SIZEOF_SIZE_T @glib_size_t@
+ #define GLIB_SIZEOF_SSIZE_T @glib_ssize_t@
+ 
+-typedef signed @glib_size_type_define@ gssize;
+-typedef unsigned @glib_size_type_define@ gsize;
+-#define G_GSIZE_MODIFIER @gsize_modifier@
+-#define G_GSSIZE_MODIFIER @gssize_modifier@
+-#define G_GSIZE_FORMAT @gsize_format@
+-#define G_GSSIZE_FORMAT @gssize_format@
++#define G_GSIZE_MODIFIER "z"
++#define G_GSSIZE_MODIFIER "z"
++#define G_GSIZE_FORMAT "zu"
++#define G_GSSIZE_FORMAT "zi"
+ 
+ #define G_MAXSIZE	G_MAXU@glib_msize_type@
+ #define G_MINSSIZE	G_MIN@glib_msize_type@
diff --git a/devel/glib2/patches/patch-glib_gtypes.h b/devel/glib2/patches/patch-glib_gtypes.h
new file mode 100644
index 00000000000..25a8d8b667e
--- /dev/null
+++ b/devel/glib2/patches/patch-glib_gtypes.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-glib_gtypes.h,v 1.1 2019/06/25 10:57:28 prlw1 Exp $
+
+We insist on C99, so size_t exists => use it.
+PR pkg/54298
+
+--- glib/gtypes.h.orig	2019-06-10 17:47:20.000000000 +0000
++++ glib/gtypes.h
+@@ -57,6 +57,9 @@ typedef unsigned int    guint;
+ typedef float   gfloat;
+ typedef double  gdouble;
+ 
++typedef size_t  gsize;
++typedef ssize_t gssize;
++
+ /* Define min and max constants for the fixed size numerical types */
+ /**
+  * G_MININT8: (value -128)