From 6b5e76dcf99bc98a5acc999cfeaa31c6cd153281 Mon Sep 17 00:00:00 2001 From: jperkin Date: Wed, 2 Mar 2016 17:19:33 +0000 Subject: [PATCH] Remove GCC pragma patch, breaks on various platforms. --- devel/glib2/distinfo | 3 +-- devel/glib2/patches/patch-glib_gdate.c | 18 ------------------ 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 devel/glib2/patches/patch-glib_gdate.c diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 1646d97b94d9..7adde13ceea5 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.213 2016/02/23 11:27:55 wiz Exp $ +$NetBSD: distinfo,v 1.214 2016/03/02 17:19:33 jperkin Exp $ SHA1 (glib-2.44.1.tar.xz) = 88176375f97ecd9ff45e7b5fd5ab80d4b7db6b34 RMD160 (glib-2.44.1.tar.xz) = 40db36e25c4baf5bdcdde34379d4968e9b35557c @@ -25,7 +25,6 @@ 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 deleted file mode 100644 index d38ecf8029de..000000000000 --- a/devel/glib2/patches/patch-glib_gdate.c +++ /dev/null @@ -1,18 +0,0 @@ -$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') - {