summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-11-25 19:27:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-29 17:43:40 +0000
commit88375498737bd86b9dff6be4bd1f83486742d8a8 (patch)
tree96b4a9f7c893f9a5f563fa435b0e71bee1b46772 /meta/recipes-gnome
parent315cc3ab703dc4f00b8b3d32a69942ec36aefc72 (diff)
downloadpoky-88375498737bd86b9dff6be4bd1f83486742d8a8.tar.gz
gdk-pixbuf: upgrade 2.38.2 -> 2.40.0
(From OE-Core rev: 081f1e043e6e5929dd54b25d440f8e7b8a15f142) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch30
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.2.bb)5
2 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch
new file mode 100644
index 0000000000..6c758fd61c
--- /dev/null
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From d8d231c01ef2e59856da8a5c26ace955e5f29370 Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Mon, 25 Nov 2019 17:05:46 +0000
7Subject: [PATCH] tests: install circular-table.gif
8
9This test data was added for the pixbuf-gif-circular-table test (added October
102018 in 0b9d004) but because the file was never actually installed the installed
11test suite never passes.
12---
13 tests/meson.build | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/tests/meson.build b/tests/meson.build
17index 5116fc2b9..80ed3e8b2 100644
18--- a/tests/meson.build
19+++ b/tests/meson.build
20@@ -97,6 +97,7 @@ test_data = [
21 'bug775693.pixdata',
22 'bug775229.pixdata',
23 'aero.gif',
24+ 'circular-table.gif'
25 ]
26
27 installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name())
28--
292.20.1
30
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.2.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
index c99510609c..699c4ecd0b 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.38.2.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
@@ -23,6 +23,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
23 file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ 23 file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \
24 file://0004-Do-not-run-tests-when-building.patch \ 24 file://0004-Do-not-run-tests-when-building.patch \
25 file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ 25 file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \
26 file://missing-test-data.patch \
26 " 27 "
27 28
28SRC_URI_append_class-target = " \ 29SRC_URI_append_class-target = " \
@@ -32,8 +33,8 @@ SRC_URI_append_class-nativesdk = " \
32 file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ 33 file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \
33 " 34 "
34 35
35SRC_URI[md5sum] = "cc1d712a1643b92ff0904d589963971f" 36SRC_URI[md5sum] = "05eb1ebc258ba905f1c8644ef49de064"
36SRC_URI[sha256sum] = "73fa651ec0d89d73dd3070b129ce2203a66171dfc0bd2caa3570a9c93d2d0781" 37SRC_URI[sha256sum] = "1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6"
37 38
38inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package 39inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package
39 40