summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-glib_gfileutils.c16
2 files changed, 1 insertions, 18 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 208393237f5..e53e20d3a9c 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.188 2013/06/15 19:18:26 adam Exp $
+$NetBSD: distinfo,v 1.189 2013/06/16 18:13:36 wiz Exp $
SHA1 (glib-2.36.3.tar.xz) = aafba69934b9ba77cc8cb0e5d8105aa1d8463eba
RMD160 (glib-2.36.3.tar.xz) = 2db71aacc028a6d39ec5fdeacf326b7a19e8bb28
@@ -31,6 +31,5 @@ SHA1 (patch-gio_gcontenttype.c) = 72f0e1b2911df5997e15ef428706c3ba6b62dd83
SHA1 (patch-gio_glocalfile.c) = 2087b54b187ae8812897f3ca9e893e542a5dd414
SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
SHA1 (patch-gio_gthreadedresolver.c) = 7626d08da36e52d9997ec33453fba5c4efdaf57e
-SHA1 (patch-glib_gfileutils.c) = 545932bd706e3d6cdf2471e1ab7b50643e34289a
SHA1 (patch-glib_gmarkup.c) = 238cce5f20d2fd9a12832d47d498edfd7290075b
SHA1 (patch-glib_gstrfuncs.c) = 6719b83e35e1f4e4e8b1c113faa8596676fd9ae5
diff --git a/devel/glib2/patches/patch-glib_gfileutils.c b/devel/glib2/patches/patch-glib_gfileutils.c
deleted file mode 100644
index ac2823cbfd3..00000000000
--- a/devel/glib2/patches/patch-glib_gfileutils.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-glib_gfileutils.c,v 1.1 2013/06/15 19:18:26 adam Exp $
-
---- glib/gfileutils.c.orig 2013-06-15 18:55:06.000000000 +0000
-+++ glib/gfileutils.c
-@@ -1019,8 +1019,11 @@ format_error_message (GError **erro
-
- display_name = g_filename_display_name (filename);
-
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (saved_errno),
- format_string, display_name, g_strerror (saved_errno));
-+#pragma GCC diagnostic pop
-
- g_free (display_name);
- }