diff options
| author |   Ross Burton <ross.burton@intel.com> | 2019-11-25 19:27:58 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-11-29 17:37:17 +0000 |
| commit | 081f1e043e6e5929dd54b25d440f8e7b8a15f142 (patch) | |
| tree | e0f5f4d9058ef5253ff019086c218a1ec1b48da2 /meta/recipes-gnome | |
| parent | b40497f9c5c62e8102ea5a81345a4cf52824a32f (diff) | |
| download | openembedded-core-contrib-081f1e043e6e5929dd54b25d440f8e7b8a15f142.tar.gz | |
gdk-pixbuf: upgrade 2.38.2 -> 2.40.0
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/missing-test-data.patch | 30 | ||||
| -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 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From d8d231c01ef2e59856da8a5c26ace955e5f29370 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Mon, 25 Nov 2019 17:05:46 +0000 +Subject: [PATCH] tests: install circular-table.gif + +This test data was added for the pixbuf-gif-circular-table test (added October +2018 in 0b9d004) but because the file was never actually installed the installed +test suite never passes. +--- + tests/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/meson.build b/tests/meson.build +index 5116fc2b9..80ed3e8b2 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -97,6 +97,7 @@ test_data = [ + 'bug775693.pixdata', + 'bug775229.pixdata', + 'aero.gif', ++ 'circular-table.gif' + ] + + installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name()) +-- +2.20.1 + 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 \ file://0001-Fix-a-couple-of-decisions-around-cross-compilation.patch \ file://0004-Do-not-run-tests-when-building.patch \ file://0006-Build-thumbnailer-and-tests-also-in-cross-builds.patch \ + file://missing-test-data.patch \ " SRC_URI_append_class-target = " \ @@ -32,8 +33,8 @@ SRC_URI_append_class-nativesdk = " \ file://0003-target-only-Work-around-thumbnailer-cross-compile-fa.patch \ " -SRC_URI[md5sum] = "cc1d712a1643b92ff0904d589963971f" -SRC_URI[sha256sum] = "73fa651ec0d89d73dd3070b129ce2203a66171dfc0bd2caa3570a9c93d2d0781" +SRC_URI[md5sum] = "05eb1ebc258ba905f1c8644ef49de064" +SRC_URI[sha256sum] = "1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6" inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gtk-doc lib_package |