Fix build on systems where format-nonliteral is turned on by default.

From coypu in PR 50753; already merged upstream.

While here, regen two patches.

4 files changed, 46 insertions, 25 deletions

diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
index ada3540a200..1646d97b94d 100644
--- a/devel/glib2/distinfo
+++ b/devel/glib2/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.212 2015/11/03 03:27:28 agc Exp $
+$NetBSD: distinfo,v 1.213 2016/02/23 11:27:55 wiz Exp $
 
 SHA1 (glib-2.44.1.tar.xz) = 88176375f97ecd9ff45e7b5fd5ab80d4b7db6b34
 RMD160 (glib-2.44.1.tar.xz) = 40db36e25c4baf5bdcdde34379d4968e9b35557c
 SHA512 (glib-2.44.1.tar.xz) = c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888
 Size (glib-2.44.1.tar.xz) = 7132940 bytes
-SHA1 (patch-aa) = 03313c0ee430a127c07510b096c5d1556c8db74e
+SHA1 (patch-aa) = d197ded7ca05c2e37396e6c6b185797bd9bb2821
 SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544
 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337
 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5
 SHA1 (patch-af) = 6da2f31b5052a9b1d02b9a87f47896be238a88bd
 SHA1 (patch-ah) = 2e23c228047d07769ef5b03b0ff636daa0435ee5
 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7
-SHA1 (patch-ak) = cb5dd83fc44c3ecb1e27415126ac7ccdb118a584
+SHA1 (patch-ak) = edf116968bd3c787fea77787add7e0164b6f1ffb
 SHA1 (patch-al) = 4eb4e241488dabe254973f5ada92898af57cd0f5
 SHA1 (patch-am) = 99f54927d76580dfeda2a6b1909e1bea5dbdc293
 SHA1 (patch-an) = 8dfc12cf0c8f3b8c7948fe3b2543a56e0cacec98
@@ -25,6 +25,7 @@ SHA1 (patch-gio_gdbusauthmechanismsha1.c) = dfbd4a85ea842f11e4bb76d39c5509fb8b0d
 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182
 SHA1 (patch-gio_gtestdbus.c) = 562d8b2f3c235d27a2ba252ff1a778b8b3e4c413
 SHA1 (patch-gio_gunixmounts.c) = 40edf6a79d37bf8eca38d0f84521a7538443c00c
+SHA1 (patch-glib_gdate.c) = e3132f5f2ae024603af3d382d453e23c2a6d2e08
 SHA1 (patch-glib_gmain.c) = d09ff66e475ee52d37ac0dcb463110f690ce6511
 SHA1 (patch-glib_gthread-posix.c) = ca93c8dc358453eb79b518c884464c90d7628888
 SHA1 (patch-glib_gtimezone.c) = d9686da52f171a073d80cfd9f80aa490088a00a3
diff --git a/devel/glib2/patches/patch-aa b/devel/glib2/patches/patch-aa
index bcd713cff51..dca2272ff20 100644
--- a/devel/glib2/patches/patch-aa
+++ b/devel/glib2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
+$NetBSD: patch-aa,v 1.59 2016/02/23 11:27:55 wiz Exp $
 
 - solaris sun studio check and fix
 - use pkgsrc libtool
@@ -7,9 +7,9 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
 - remove unnecessary executions of libtool from configure
   https://bugzilla.gnome.org/show_bug.cgi?id=736710
 
---- configure.orig	2013-10-15 19:14:48.000000000 +0000
+--- configure.orig	2015-05-13 02:50:37.000000000 +0000
 +++ configure
-@@ -730,6 +730,7 @@ GIO
+@@ -734,6 +734,7 @@ GIO
  GSPAWN
  GLIB_DEBUG_FLAGS
  G_MODULE_NEED_USCORE
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  G_MODULE_BROKEN_RTLD_GLOBAL
  G_MODULE_HAVE_DLERROR
  G_MODULE_LDFLAGS
-@@ -21145,6 +21146,8 @@ else
+@@ -21012,6 +21013,8 @@ else
  # ifdef _MSC_VER
  #  include <malloc.h>
  #  define alloca _alloca
@@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  # else
  #  ifdef HAVE_ALLOCA_H
  #   include <alloca.h>
-@@ -22150,8 +22153,8 @@ else
+@@ -21979,8 +21982,8 @@ else
  fi
  
  
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
-@@ -24049,16 +24052,48 @@ fi
+@@ -23747,16 +23750,48 @@ fi
  
  case $host in
    *-*-solaris* )
@@ -87,7 +87,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  esac
  
  if test "$ac_cv_func_statfs" = yes; then :
-@@ -25050,10 +25085,11 @@ if test x"$glib_native_win32" = xyes; th
+@@ -24824,10 +24859,11 @@ if test x"$glib_native_win32" = xyes; th
      G_MODULE_LDFLAGS=
  else
    export SED
@@ -100,7 +100,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  G_MODULE_HAVE_DLERROR=0
  if test -z "$G_MODULE_IMPL"; then
    case "$host" in
-@@ -25271,13 +25307,12 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
+@@ -24953,13 +24989,12 @@ if  test "$G_MODULE_IMPL" = "G_MODULE_IM
  	LIBS="$G_MODULE_LIBS $LIBS"
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -116,7 +116,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RTLD_GLOBAL brokenness" >&5
  $as_echo_n "checking for RTLD_GLOBAL brokenness... " >&6; }
  if ${glib_cv_rtldglobal_broken+:} false; then :
-@@ -25387,6 +25423,56 @@ fi
+@@ -25069,6 +25104,56 @@ fi
  	LIBS="$LIBS_orig"
  
  fi
@@ -173,7 +173,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
          G_MODULE_SUPPORTED=false
-@@ -25397,7 +25483,5 @@ fi
+@@ -25079,8 +25164,6 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5
  $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
  export SED
@@ -181,7 +181,8 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
 -eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -25421,6 +25507,7 @@ fi
+ glib_gmodule_suffix=`echo $std_shrext | sed 's/^\.//'`
+@@ -25103,6 +25186,7 @@ fi
  
  
  
@@ -189,7 +190,7 @@ $NetBSD: patch-aa,v 1.58 2014/10/07 23:18:36 prlw1 Exp $
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gspawn implementation" >&5
  $as_echo_n "checking for gspawn implementation... " >&6; }
  case "$host" in
-@@ -26398,62 +26485,8 @@ if  test x"$have_threads" = xposix; then
+@@ -26077,62 +26161,8 @@ if  test x"$have_threads" = xposix; then
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
diff --git a/devel/glib2/patches/patch-ak b/devel/glib2/patches/patch-ak
index 8ac4e7801fd..8fecbb335bc 100644
--- a/devel/glib2/patches/patch-ak
+++ b/devel/glib2/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
+$NetBSD: patch-ak,v 1.19 2016/02/23 11:27:55 wiz Exp $
 
 - solaris sun studio check and fix
 - use pkgsrc libtool
@@ -7,9 +7,9 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
 - remove unnecessary executions of libtool from configure
   https://bugzilla.gnome.org/show_bug.cgi?id=736710
 
---- configure.ac.orig	2013-06-09 22:53:13.000000000 +0000
+--- configure.ac.orig	2015-05-13 02:45:52.000000000 +0000
 +++ configure.ac
-@@ -858,7 +858,7 @@ int main (void)
+@@ -750,7 +750,7 @@ int main (void)
  AC_MSG_RESULT($g_have_gnuc_visibility)
  AM_CONDITIONAL(HAVE_GNUC_VISIBILITY, [test x$g_have_gnuc_visibility = xyes])
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
  #else
  # include "error: this is not Sun Studio."
-@@ -1129,10 +1129,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
+@@ -1102,10 +1102,22 @@ AC_CHECK_TYPE([struct ip_mreqn], [
  
  case $host in
    *-*-solaris* )
@@ -45,7 +45,7 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
  esac
  
  dnl
-@@ -1491,11 +1503,12 @@ if test x"$glib_native_win32" = xyes; th
+@@ -1440,11 +1452,12 @@ if test x"$glib_native_win32" = xyes; th
    G_MODULE_LDFLAGS=
  else
    export SED
@@ -59,7 +59,7 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
  G_MODULE_HAVE_DLERROR=0
  dnl *** force native WIN32 shared lib loader 
  if test -z "$G_MODULE_IMPL"; then
-@@ -1556,13 +1569,12 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODUL
+@@ -1489,13 +1502,12 @@ AS_IF([ test "$G_MODULE_IMPL" = "G_MODUL
  	LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
  dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
  	echo "void glib_plugin_test(void) { }" > plugin.c
@@ -75,7 +75,7 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
  	AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
  		glib_cv_rtldglobal_broken,[
  		AC_TRY_RUN([
-@@ -1625,6 +1638,38 @@ dnl *** check for having dlerror()
+@@ -1558,6 +1570,38 @@ dnl *** check for having dlerror()
  		[G_MODULE_HAVE_DLERROR=0])
  	LIBS="$LIBS_orig"
  ])
@@ -114,7 +114,7 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
  dnl *** done, have we got an implementation?
  if test -z "$G_MODULE_IMPL"; then
  	G_MODULE_IMPL=0
-@@ -1635,7 +1680,5 @@ fi
+@@ -1568,8 +1612,6 @@ fi
  
  AC_MSG_CHECKING(for the suffix of module shared libraries)
  export SED
@@ -122,7 +122,8 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
 -eval $shrext_cmds
  module=yes eval std_shrext=$shrext_cmds
  # chop the initial dot
-@@ -1654,6 +1699,7 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
+ glib_gmodule_suffix=`echo $std_shrext | sed 's/^\.//'`
+@@ -1587,6 +1629,7 @@ AC_SUBST(G_MODULE_PLUGIN_LIBS)
  AC_SUBST(G_MODULE_LDFLAGS)
  AC_SUBST(G_MODULE_HAVE_DLERROR)
  AC_SUBST(G_MODULE_BROKEN_RTLD_GLOBAL)
@@ -130,7 +131,7 @@ $NetBSD: patch-ak,v 1.18 2014/10/07 23:18:36 prlw1 Exp $
  AC_SUBST(G_MODULE_NEED_USCORE)
  AC_SUBST(GLIB_DEBUG_FLAGS)
  
-@@ -2035,22 +2081,8 @@ AS_IF([ test x"$have_threads" = xposix],
+@@ -1963,22 +2006,8 @@ AS_IF([ test x"$have_threads" = xposix],
        G_THREAD_LIBS="-lpthread -lthread"
        ;;
      *)
diff --git a/devel/glib2/patches/patch-glib_gdate.c b/devel/glib2/patches/patch-glib_gdate.c
new file mode 100644
index 00000000000..d38ecf8029d
--- /dev/null
+++ b/devel/glib2/patches/patch-glib_gdate.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-glib_gdate.c,v 1.1 2016/02/23 11:27:55 wiz Exp $
+
+https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7
+Merged upstream. Remove this in next release.
+
+--- glib/gdate.c.orig	2014-12-19 21:49:48.000000000 +0000
++++ glib/gdate.c
+@@ -2494,7 +2494,10 @@ g_date_strftime (gchar       *s, 
+        * recognize whether strftime actually failed or just returned "".
+        */
+       tmpbuf[0] = '\1';
++      #pragma GCC diagnostic push
++      #pragma GCC diagnostic ignored "-Wformat-nonliteral"
+       tmplen = strftime (tmpbuf, tmpbufsize, locale_format, &tm);
++      #pragma GCC diagnostic pop
+ 
+       if (tmplen == 0 && tmpbuf[0] != '\0')
+         {