diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-01-22 15:58:01 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-26 22:47:29 +0000 |
| commit | 553a12329a50dfac86afd44b6bacbe1a42b675a7 (patch) | |
| tree | a3792b369dc2f6add60910c40f66ebbead543a87 /meta/recipes-gnome/gdk-pixbuf | |
| parent | de83a71d416a51caf5b8b0db9c9102689b2cce8b (diff) | |
| download | openembedded-core-contrib-553a12329a50dfac86afd44b6bacbe1a42b675a7.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/libc_memfuncs.patch | 63 | ||||
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.3.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.32.1.bb) | 5 |
2 files changed, 2 insertions, 66 deletions
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 index 82a27c3ac4..0000000000 --- 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 index 104c743914..ed9c2326e5 100644 --- 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 |