From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] pkg-config: update to 2.29.2
Date: Tue, 06 Jun 2017 10:07:57 +0200
Message-ID: <20170606080757.31505-1-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2294798058686716558=="
List-Id: <development.lists.ipfire.org>

--===============2294798058686716558==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 lfs/pkg-config                                     |  5 ++--
 src/patches/pkg-config-0.29-glib-compile-fix.patch | 29 --------------------=
--
 2 files changed, 2 insertions(+), 32 deletions(-)
 delete mode 100644 src/patches/pkg-config-0.29-glib-compile-fix.patch

diff --git a/lfs/pkg-config b/lfs/pkg-config
index 8523d8a..36fb40a 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 0.29.1
+VER        =3D 0.29.2
=20
 THISAPP    =3D pkg-config-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -50,7 +50,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D f739a28cae4e0ca291f82d1d41ef107d
+$(DL_FILE)_MD5 =3D f6e931e319531b736fadc017f470e68a
=20
 install : $(TARGET)
=20
@@ -80,7 +80,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP)/glib && patch -Np1 < $(DIR_SRC)/src/patches/pkg-config-0.29-g=
lib-compile-fix.patch
 ifeq "$(ROOT)" ""
 else
 	mkdir -pv /tools/lib/pkgconfig
diff --git a/src/patches/pkg-config-0.29-glib-compile-fix.patch b/src/patches=
/pkg-config-0.29-glib-compile-fix.patch
deleted file mode 100644
index a092882..0000000
--- a/src/patches/pkg-config-0.29-glib-compile-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0817af40e8c74c721c30f6ef482b1f53d12044c7 Mon Sep 17 00:00:00 2001
-From: coypu <coypu(a)sdf.org>
-Date: Mon, 8 Feb 2016 00:06:06 +0200
-Subject: gdate: Suppress string format literal warning
-
-Newer versions of GCC emit an error here, but we know it's safe.
-https://bugzilla.gnome.org/761550
----
- glib/gdate.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/glib/gdate.c b/glib/gdate.c
-index 4aece02..cdc735c 100644
---- a/glib/gdate.c
-+++ b/glib/gdate.c
-@@ -2494,7 +2494,10 @@ g_date_strftime (gchar       *s,
-        * recognize whether strftime actually failed or just returned "".
-        */
-       tmpbuf[0] =3D '\1';
-+      #pragma GCC diagnostic push
-+      #pragma GCC diagnostic ignored "-Wformat-nonliteral"
-       tmplen =3D strftime (tmpbuf, tmpbufsize, locale_format, &tm);
-+      #pragma GCC diagnostic pop
-=20
-       if (tmplen =3D=3D 0 && tmpbuf[0] !=3D '\0')
-         {
---=20
-cgit v0.12
-
--=20
2.9.3


--===============2294798058686716558==--