From dc813c825367b97129e2161e22d5be8c43dfb815 Mon Sep 17 00:00:00 2001 From: Peter Wagner Date: Sun, 18 Mar 2018 15:05:05 +0100 Subject: [PATCH] glib2: update to 2.56.0 Signed-off-by: Peter Wagner --- libs/glib2/Makefile | 6 ++--- libs/glib2/patches/001-automake-compat.patch | 2 +- ...ppress-string-format-literal-warning.patch | 24 ------------------- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 libs/glib2/patches/002-gdate-Suppress-string-format-literal-warning.patch diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index cabd69ade4..9ec8c9d3c4 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glib2 -PKG_VERSION:=2.55.1 +PKG_VERSION:=2.56.0 PKG_RELEASE:=1 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION) -PKG_SOURCE_URL:=@GNOME/glib/2.55 -PKG_HASH:=0cbb3d31c9d181bbcc97cba3d9dbe3250f75e2da25e5f7c8bf5a993fe54baf6a +PKG_SOURCE_URL:=@GNOME/glib/2.56 +PKG_HASH:=ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7 PKG_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1 diff --git a/libs/glib2/patches/001-automake-compat.patch b/libs/glib2/patches/001-automake-compat.patch index 19ea0ab269..0b510675a4 100644 --- a/libs/glib2/patches/001-automake-compat.patch +++ b/libs/glib2/patches/001-automake-compat.patch @@ -1,6 +1,6 @@ --- a/gtk-doc.make +++ b/gtk-doc.make -@@ -277,7 +277,7 @@ uninstall-local: +@@ -298,7 +298,7 @@ uninstall-local: # # Require gtk-doc when making dist # diff --git a/libs/glib2/patches/002-gdate-Suppress-string-format-literal-warning.patch b/libs/glib2/patches/002-gdate-Suppress-string-format-literal-warning.patch deleted file mode 100644 index 01769cb967..0000000000 --- a/libs/glib2/patches/002-gdate-Suppress-string-format-literal-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0817af40e8c74c721c30f6ef482b1f53d12044c7 Mon Sep 17 00:00:00 2001 -From: coypu -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(+) - ---- a/glib/gdate.c -+++ b/glib/gdate.c -@@ -2497,7 +2497,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') - {