@@ -1,4 +1,4 @@
-From 325a4cde99a00b84116ab7111d27e6973f3c5026 Mon Sep 17 00:00:00 2001
+From 3b6aab24f6844b7d5b3e166bc910bffbcee1f6f5 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Thu, 26 Jan 2023 20:29:46 +0100
Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile
@@ -13,16 +13,19 @@ items that do require running target executables.
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/150]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+
+rebase to version 2.44.5
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
meson.build | 6 +++---
tests/meson.build | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
-index 3eb3fcc..dc7e790 100644
+index f478326..464ae1d 100644
--- a/meson.build
+++ b/meson.build
-@@ -390,10 +390,10 @@ subdir('gdk-pixbuf')
+@@ -428,10 +428,10 @@ subdir('gdk-pixbuf')
# i18n
subdir('po')
@@ -37,19 +40,19 @@ index 3eb3fcc..dc7e790 100644
if not thumbnailer_opt.disabled()
subdir('thumbnailer')
diff --git a/tests/meson.build b/tests/meson.build
-index 3781066..911b5fb 100644
+index 9b96fdc..9c3ed7d 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -4,7 +4,7 @@
# gdk-pixbuf-pixdata from build directory because it needs all DLL locations in
# $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with
# this problem: See https://github.com/mesonbuild/meson/issues/8266.
--if enabled_loaders.contains('png') and host_system != 'windows'
-+if enabled_loaders.contains('png') and host_system != 'windows' and not meson.is_cross_build()
+-if (enabled_loaders.contains('png') or enabled_loaders.contains('glycin')) and host_system != 'windows'
++if (enabled_loaders.contains('png') or enabled_loaders.contains('glycin')) and host_system != 'windows' and not meson.is_cross_build()
# Resources; we cannot use gnome.compile_resources() here, because we need to
# override the environment in order to use the utilities we just built instead
# of the system ones
-@@ -164,9 +164,11 @@ endif
+@@ -159,9 +159,11 @@ endif
test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ]
test_args = [ '-k' ]
test_env = environment()
@@ -64,3 +67,6 @@ index 3781066..911b5fb 100644
foreach test_name, test_data: installed_tests
test_sources = [ test_name + '.c', 'test-common.c' ]
+--
+2.34.1
+
similarity index 97%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.4.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.5.bb
@@ -14,7 +14,7 @@ SECTION = "libs"
DEPENDS = "glib-2.0 shared-mime-info"
-SRC_URI[archive.sha256sum] = "93a1aac3f1427ae73457397582a2c38d049638a801788ccbd5f48ca607bdbd17"
+SRC_URI[archive.sha256sum] = "69b93e09139b80c0ee661503d60deb5a5874a31772b5184b9cd5462a4100ab68"
inherit gettext gnomebase pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package manpages
NEWS: 2.44.5 === - Make the testsuite work with glycin - glycin: Add support for xpm and xbm - TRanslation updates Signed-off-by: Changqing Li <changqing.li@windriver.com> --- ...w-a-subset-of-tests-in-cross-compile.patch | 20 ++++++++++++------- ...-pixbuf_2.44.4.bb => gdk-pixbuf_2.44.5.bb} | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.44.4.bb => gdk-pixbuf_2.44.5.bb} (97%)