Re: pkg/50753: pkg-config build failure with gcc6 defaults (linux)

[coypu <coypu%sdf.org@localhost>]

The following reply was made to PR pkg/50753; it has been noted by GNATS.

From: coypu <coypu%sdf.org@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/50753: pkg-config build failure with gcc6 defaults (linux)
Date: Tue, 9 Feb 2016 20:13:41 +0000

 glib: fix build with -Werror=format-nonliteral
 
 Same change for pkg-config which has a copy of glib.
 ---
  devel/glib2/distinfo                             |  1 +
  devel/glib2/patches/patch-glib_gdate.c           | 18 ++++++++++++++++++
  devel/pkg-config/distinfo                        |  1 +
  devel/pkg-config/patches/patch-glib_glib_gdate.c | 18 ++++++++++++++++++
  4 files changed, 38 insertions(+)
  create mode 100644 devel/glib2/patches/patch-glib_gdate.c
  create mode 100644 devel/pkg-config/patches/patch-glib_glib_gdate.c
 
 diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo
 index ada3540..05f303e 100644
 --- a/devel/glib2/distinfo
 +++ b/devel/glib2/distinfo
 @@ -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-glib_gdate.c b/devel/glib2/patches/patch-glib_gdate.c
 new file mode 100644
 index 0000000..140fc43
 --- /dev/null
 +++ b/devel/glib2/patches/patch-glib_gdate.c
 @@ -0,0 +1,18 @@
 +$NetBSD$
 +
 +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')
 +         {
 diff --git a/devel/pkg-config/distinfo b/devel/pkg-config/distinfo
 index 73b5b97..e52db59 100644
 --- a/devel/pkg-config/distinfo
 +++ b/devel/pkg-config/distinfo
 @@ -6,4 +6,5 @@ SHA512 (pkg-config-0.29.tar.gz) = c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c
  Size (pkg-config-0.29.tar.gz) = 1973875 bytes
  SHA1 (patch-configure) = 6847644b9df3e3e2334f7c45bcbb2d3b7734d165
  SHA1 (patch-glib_configure) = 5080a19186a948ba305278cef91ec76a920429e4
 +SHA1 (patch-glib_glib_gdate.c) = 97ee5e99b941a04c8c1a8ac4dd552923d2f8b541
  SHA1 (patch-glib_glib_gtimer.c) = ee877a6c148b148a86f9087960863cfa8305bbf7
 diff --git a/devel/pkg-config/patches/patch-glib_glib_gdate.c b/devel/pkg-config/patches/patch-glib_glib_gdate.c
 new file mode 100644
 index 0000000..87eeb5c
 --- /dev/null
 +++ b/devel/pkg-config/patches/patch-glib_glib_gdate.c
 @@ -0,0 +1,18 @@
 +$NetBSD$
 +
 +https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7
 +Merged upstream. Remove this in next release.
 +
 +--- glib/glib/gdate.c.orig	2014-02-08 17:57:06.000000000 +0000
 ++++ glib/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')
 +         {
 -- 
 2.7.0
 
 
 --