summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2024-05-16 11:06:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-05-28 09:38:23 +0100
commit3547b547835ed40059eae41051962db5f2b6f5f1 (patch)
tree5f3ab3fceebbea551ac32ee943f58a6944308f1b /meta
parent9c96fa8b1edfe1a5c89f7005e3a4833fcde02e9c (diff)
downloadpoky-3547b547835ed40059eae41051962db5f2b6f5f1.tar.gz
gdk-pixbuf: upgrade 2.42.11 -> 2.42.12
- Fix a build failure (Christian Heusel) - Fix occasional build failures (Benjamin Gilbert) - ani: Reject files with multiple INA or IART chunks (Benjamin Gilbert) - ani: Reject files with multiple anih chunks (Benjamin Gilbert, CVE-2022-48622) - ani: validate chunk size (Benjamin Gilbert) - Translation updates (From OE-Core rev: c5b202b0aef56ecf7982887c54b4ecbc4bbe73ae) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch8
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch2
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb (renamed from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb)2
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch
index 3d685db774..24edda8102 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch
@@ -1,4 +1,4 @@
1From 4bfb696fd125f044e3df9f6983c4ad518d9552c7 Mon Sep 17 00:00:00 2001 1From 325a4cde99a00b84116ab7111d27e6973f3c5026 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de> 2From: Alexander Kanavin <alex@linutronix.de>
3Date: Thu, 26 Jan 2023 20:29:46 +0100 3Date: Thu, 26 Jan 2023 20:29:46 +0100
4Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile 4Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile
@@ -19,7 +19,7 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
19 2 files changed, 9 insertions(+), 7 deletions(-) 19 2 files changed, 9 insertions(+), 7 deletions(-)
20 20
21diff --git a/meson.build b/meson.build 21diff --git a/meson.build b/meson.build
22index 78f3683..e0feaee 100644 22index 3eb3fcc..dc7e790 100644
23--- a/meson.build 23--- a/meson.build
24+++ b/meson.build 24+++ b/meson.build
25@@ -390,10 +390,10 @@ subdir('gdk-pixbuf') 25@@ -390,10 +390,10 @@ subdir('gdk-pixbuf')
@@ -37,7 +37,7 @@ index 78f3683..e0feaee 100644
37 endif 37 endif
38 38
39diff --git a/tests/meson.build b/tests/meson.build 39diff --git a/tests/meson.build b/tests/meson.build
40index 78d0ad9..0c9e64e 100644 40index 3781066..911b5fb 100644
41--- a/tests/meson.build 41--- a/tests/meson.build
42+++ b/tests/meson.build 42+++ b/tests/meson.build
43@@ -4,7 +4,7 @@ 43@@ -4,7 +4,7 @@
@@ -49,7 +49,7 @@ index 78d0ad9..0c9e64e 100644
49 # Resources; we cannot use gnome.compile_resources() here, because we need to 49 # Resources; we cannot use gnome.compile_resources() here, because we need to
50 # override the environment in order to use the utilities we just built instead 50 # override the environment in order to use the utilities we just built instead
51 # of the system ones 51 # of the system ones
52@@ -172,9 +172,11 @@ endif 52@@ -164,9 +164,11 @@ endif
53 test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] 53 test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ]
54 test_args = [ '-k' ] 54 test_args = [ '-k' ]
55 test_env = environment() 55 test_env = environment()
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
index 80c93e2166..3b4bf62861 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/fatal-loader.patch
@@ -1,4 +1,4 @@
1From 9b4f5738f8ac30f393b6163dcc84757976683d9b Mon Sep 17 00:00:00 2001 1From f78ab4edaee5f62663a9a4bcfa56e5c524da4474 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com> 2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 1 Apr 2014 17:23:36 +0100 3Date: Tue, 1 Apr 2014 17:23:36 +0100
4Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal 4Subject: [PATCH] gdk-pixbuf: add an option so that loader errors are fatal
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb
index ef0f23f8f7..9f825a68ef 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.11.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb
@@ -22,7 +22,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
22 file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ 22 file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \
23 " 23 "
24 24
25SRC_URI[sha256sum] = "49dcb402388708647e8c321d56b6fb30f21e51e515d0c5a942268d23052a2f00" 25SRC_URI[sha256sum] = "b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7"
26 26
27inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package 27inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package
28 28