gdk-pixbuf: update to 2.32.3

Drop backported libc_memfuncs.patch

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
deleted file mode 100644 (file)
index 82a27c3..0000000
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 205a3b04e1216c1df199aec95185f7f48b8e0491 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 6 Oct 2015 09:11:38 +0200
-Subject: Run only pixbuf-lowmem test on GNU libc
-
-The test case depends on GNU libc specific internals so we only run it
-on GNU libc.
-
-This fixes build on Linux with musl libc.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756078
----
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport
-
- tests/Makefile.am     | 5 -----
- tests/pixbuf-lowmem.c | 8 ++++++++
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bdd68f3..c122188 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -19,13 +19,8 @@ LDADD = \
- noinst_PROGRAMS +=                    \
-       pixbuf-read                     \
-       pixbuf-random                   \
--      $(NULL)
--
--if OS_LINUX
--noinst_PROGRAMS +=                    \
-       pixbuf-lowmem                   \
-       $(NULL)
--endif
- 
- test_programs =                       \
-       animation                       \
-diff --git a/tests/pixbuf-lowmem.c b/tests/pixbuf-lowmem.c
-index ae71788..9e9571f 100644
---- a/tests/pixbuf-lowmem.c
-+++ b/tests/pixbuf-lowmem.c
-@@ -24,6 +24,7 @@
- #include <time.h>
- #include <string.h>
- 
-+#ifdef __GLIBC__
- #define PRETEND_MEM_SIZE (16 * 1024 * 1024)
- #define REMAINING_MEM_SIZE 100000
- 
-@@ -225,3 +226,10 @@ main (int argc, char **argv)
-   
-   return 0;
- }
-+#else
-+int
-+main (int argc, char **argv)
-+{
-+      return 0;
-+}
-+#endif
--- 
-cgit v0.11.2
-

diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
similarity index 95%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
index 104c743914e0812be4f0f7d475a26fc03e63a6d0..ed9c2326e5fc3a5f2964b8254b0980aa1dd8bf4f 100644 (file)
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb
@@ -17,11 +17,10 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
            file://extending-libinstall-dependencies.patch \
            file://run-ptest \
            file://fatal-loader.patch \
-           file://libc_memfuncs.patch \
            "
 
-SRC_URI[md5sum] = "b1590189a2e89fab9f871959c168508c"
-SRC_URI[sha256sum] = "4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc"
+SRC_URI[md5sum] = "9275076639baa24a342f3e02c402920e"
+SRC_URI[sha256sum] = "2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031"
 
 inherit autotools pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even