Signed-off-by: Marcel Lorenz marcel.lorenz@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 @@
include Config
-VER = 0.29.1 +VER = 0.29.2
THISAPP = pkg-config-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f739a28cae4e0ca291f82d1d41ef107d +$(DL_FILE)_MD5 = f6e931e319531b736fadc017f470e68a
install : $(TARGET)
@@ -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-glib-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@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] = '\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') - { --- -cgit v0.12 -