pkg/47934: pkgsrc/devel/glib2 build failure with gcc

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

>Number:         47934
>Category:       pkg
>Synopsis:       pkgsrc/devel/glib2 build failure with gcc
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jun 16 05:45:00 +0000 2013
>Originator:     Izumi Tsutsui
>Release:        NetBSD 6.1
>Organization:
>Environment:
System: NetBSD 6.1 (GENERIC) pkgsrc HEAD updated around 201306160530Z
Architecture: i386
Machine: i386
>Description:

  CC       libglib_2_0_la-gfileutils.lo
gfileutils.c: In function 'format_error_message':
gfileutils.c:1022:9: error: #pragma GCC diagnostic not allowed inside functions
gfileutils.c:1023:9: error: #pragma GCC diagnostic not allowed inside functions
gfileutils.c:1026:9: error: #pragma GCC diagnostic not allowed inside functions
gmake[4]: *** [libglib_2_0_la-gfileutils.lo] Error 1

>How-To-Repeat:
checkout pkgsrc HEAD
# cd devel/glib2
# make package
on stock NetBSD/i386 6.1

>Fix:
revert the recent change:
http://mail-index.netbsd.org/pkgsrc-changes/2013/06/15/msg090822.html
>> Log Message:
>> Fix building with clang
which added the following pragmas:
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/devel/glib2/patches/patch-glib_gfileutils.c?rev=1.1&content-type=text/x-cvsweb-markup

$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);
 }