summaryrefslogtreecommitdiff
path: root/devel/glib2
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2015-10-16 10:18:48 +0000
committertnn <tnn@pkgsrc.org>2015-10-16 10:18:48 +0000
commiteed31d181aa33cd2154c9331c020e1c8c0747ff4 (patch)
treeb390937a62728486f6efe7a2792e1dd1554497fc /devel/glib2
parentd93319a59d83cb708bcc6ca067dd3ae61df246b2 (diff)
downloadpkgsrc-eed31d181aa33cd2154c9331c020e1c8c0747ff4.tar.gz
fix build on NetBSD-current (%m printf modifier not allowed)
Diffstat (limited to 'devel/glib2')
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-gio_gtestdbus.c32
2 files changed, 34 insertions, 1 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 1861eac8366..59846da4611 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.209 2015/06/10 23:00:05 prlw1 Exp $
+$NetBSD: distinfo,v 1.210 2015/10/16 10:18:48 tnn Exp $
SHA1 (glib-2.44.1.tar.xz) = 88176375f97ecd9ff45e7b5fd5ab80d4b7db6b34
RMD160 (glib-2.44.1.tar.xz) = 40db36e25c4baf5bdcdde34379d4968e9b35557c
@@ -22,6 +22,7 @@ SHA1 (patch-cl) = 871e1ca59f697eddd6692702fc7d63a2df826afc
SHA1 (patch-cm) = 534af37ae8f2bd667f630142058d4de5ea91be93
SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d5baa
SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
+SHA1 (patch-gio_gtestdbus.c) = 97d37dd795f5ae024f0f4932eef1fa4a6395f7ca
SHA1 (patch-gio_gunixmounts.c) = 40edf6a79d37bf8eca38d0f84521a7538443c00c
SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
diff --git a/devel/glib2/patches/patch-gio_gtestdbus.c b/devel/glib2/patches/patch-gio_gtestdbus.c
new file mode 100644
index 00000000000..236dd172e5b
--- /dev/null
+++ b/devel/glib2/patches/patch-gio_gtestdbus.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-gio_gtestdbus.c,v 1.1 2015/10/16 10:18:48 tnn Exp $
+
+%m modifier is a GNU extension and not permitted in sprintf.
+
+--- gio/gtestdbus.c.orig 2015-05-13 02:39:04.000000000 +0000
++++ gio/gtestdbus.c
+@@ -25,6 +25,8 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <gstdio.h>
++#include <errno.h>
++#include <string.h> /* for strerror(3) */
+ #ifdef G_OS_UNIX
+ #include <unistd.h>
+ #endif
+@@ -243,14 +245,14 @@ watcher_init (void)
+ /* fork a child to clean up when we are killed */
+ if (pipe (pipe_fds) != 0)
+ {
+- g_warning ("pipe() failed: %m");
++ g_warning ("pipe() failed: %s", strerror(errno));
+ g_assert_not_reached ();
+ }
+
+ switch (fork ())
+ {
+ case -1:
+- g_warning ("fork() failed: %m");
++ g_warning ("fork() failed: %s", strerror(errno));
+ g_assert_not_reached ();
+ break;
+