Fix building with clang

3 files changed, 24 insertions, 7 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 2596e790c3d..6071f283400 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.215 2013/05/31 22:53:23 prlw1 Exp $
+# $NetBSD: Makefile,v 1.216 2013/06/15 19:18:26 adam Exp $
 
 .include "Makefile.common"
 
@@ -42,16 +42,16 @@ LIBS.SunOS+=		-lnsl -lsocket
 CPPFLAGS.SunOS+=	-DBSD_COMP
 
 .if ${OBJECT_FMT} == "ELF"
-. if ${OPSYS} == "SunOS"
-.  if ${ABI} == 32
+.  if ${OPSYS} == "SunOS"
+.    if ${ABI} == 32
 # Solaris libelf in 32-bit mode does not support largefile.  We patch files
 # individually to force _FILE_OFFSET_BITS=32 but need to turn back on -lelf
 # after configure disabled it.
 CONFIGURE_ENV+=		LIBELF_LIBS='-lelf'
+.    endif
+.  else
+.  include "../../devel/libelf/buildlink3.mk"
 .  endif
-. else
-.include "../../devel/libelf/buildlink3.mk"
-. endif
 .endif
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index 56c85fe6237..208393237f5 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.187 2013/06/14 21:04:03 wiz Exp $
+$NetBSD: distinfo,v 1.188 2013/06/15 19:18:26 adam 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) = 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
new file mode 100644
index 00000000000..ac2823cbfd3
--- /dev/null
+++ b/devel/glib2/patches/patch-glib_gfileutils.c
@@ -0,0 +1,16 @@
+$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);
+ }