summaryrefslogtreecommitdiff
path: root/devel/glib2
diff options
context:
space:
mode:
authorjoerg <joerg>2013-06-16 20:37:07 +0000
committerjoerg <joerg>2013-06-16 20:37:07 +0000
commitdfef36d9844652ef3dd9233b8a2f72295b1241c2 (patch)
tree717d8b4c193e449aa4f98eb74587ad5873599834 /devel/glib2
parent34f69a85cf19c32d18113d20a0b9fd7a8a248286 (diff)
downloadpkgsrc-dfef36d9844652ef3dd9233b8a2f72295b1241c2.tar.gz
Reapply clang fix.
Diffstat (limited to 'devel/glib2')
-rw-r--r--devel/glib2/distinfo3
-rw-r--r--devel/glib2/patches/patch-glib_gfileutils.c21
2 files changed, 23 insertions, 1 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index e53e20d3a9c..ff06be77e7b 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.189 2013/06/16 18:13:36 wiz Exp $
+$NetBSD: distinfo,v 1.190 2013/06/16 20:37:07 joerg Exp $
SHA1 (glib-2.36.3.tar.xz) = aafba69934b9ba77cc8cb0e5d8105aa1d8463eba
RMD160 (glib-2.36.3.tar.xz) = 2db71aacc028a6d39ec5fdeacf326b7a19e8bb28
@@ -31,5 +31,6 @@ 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) = 667e9ed2a8a9cca09f9eb4218e467d11544822f3
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
new file mode 100644
index 00000000000..1f1baeb3732
--- /dev/null
+++ b/devel/glib2/patches/patch-glib_gfileutils.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-glib_gfileutils.c,v 1.3 2013/06/16 20:37:07 joerg Exp $
+
+--- glib/gfileutils.c.orig 2013-06-09 22:15:54.000000000 +0000
++++ glib/gfileutils.c
+@@ -1009,6 +1009,8 @@ rename_file (const char *old_name,
+ * - the place for the filename
+ * - the place for the strerror
+ */
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+ static void
+ format_error_message (GError **error,
+ const gchar *filename,
+@@ -1024,6 +1026,7 @@ format_error_message (GError **erro
+
+ g_free (display_name);
+ }
++#pragma GCC diagnostic pop
+
+ static gchar *
+ write_to_temp_file (const gchar *contents,