diff mbox series

[2/2] gdk-pixbuf: upgrade 2.42.12 -> 2.44.4

Message ID 20251216161001.352088-2-ross.burton@arm.com
State New
Headers show
Series [1/2] gdk-pixbuf: small cleanups | expand

Commit Message

Ross Burton Dec. 16, 2025, 4:10 p.m. UTC 
Upstream changes (subset):
- Add glycin loader (a sandboxed rust image loading framework)
- Deprecate the XPM-related API
- The animation-related APIs have been deprecated
- jpeg: Fix a crash related to icc data (CVE-2025-7345)
- Prefer builtin modules

Explicitly disable the glycin plugin for now, as we don't have a recipe
for glycin yet.

Explicitly disable the thumbnailer for now, this hasn't been built since
2.38[2] and would need more integration to work in cross builds.

Use 'documentation' for the gi-docgen option[1].

[1] gdk-pixbuf ee5a35665 ("build: Add "documentation" configuration option")
[2] gdk-pixbuf fc3770831 ("meson: don't build tests or the thumbnailer if cross building")
since 2.38

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ...on.build-allow-a-subset-of-tests-in-cross-compile.patch | 6 +++---
 .../{gdk-pixbuf_2.42.12.bb => gdk-pixbuf_2.44.4.bb}        | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)
 rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.42.12.bb => gdk-pixbuf_2.44.4.bb} (93%)
diff mbox series

Patch

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 24edda81021..534f4e00765 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
@@ -33,9 +33,9 @@  index 3eb3fcc..dc7e790 100644
 -  if get_option('tests')
 -    subdir('tests')
 -  endif
-   subdir('thumbnailer')
- endif
- 
+   thumbnailer_opt = get_option('thumbnailer').disable_auto_if(glycin_dep.found())
+   if not thumbnailer_opt.disabled()
+     subdir('thumbnailer')
 diff --git a/tests/meson.build b/tests/meson.build
 index 3781066..911b5fb 100644
 --- a/tests/meson.build
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.4.bb
similarity index 93%
rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb
rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.4.bb
index 750098ba022..0c06bdda096 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.4.bb
@@ -14,7 +14,7 @@  SECTION = "libs"
 
 DEPENDS = "glib-2.0 shared-mime-info"
 
-SRC_URI[archive.sha256sum] = "b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7"
+SRC_URI[archive.sha256sum] = "93a1aac3f1427ae73457397582a2c38d049638a801788ccbd5f48ca607bdbd17"
 
 inherit gettext gnomebase pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package manpages
 
@@ -27,6 +27,7 @@  SRC_URI += "\
 GIR_MESON_OPTION = "introspection"
 GIR_MESON_ENABLE_FLAG = "enabled"
 GIR_MESON_DISABLE_FLAG = "disabled"
+GIDOCGEN_MESON_OPTION = "documentation"
 
 LIBV = "2.10.0"
 
@@ -41,6 +42,10 @@  PACKAGECONFIG[others] = "-Dothers=enabled,-Dothers=disabled"
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,python3-docutils-native"
 PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false"
 
+# Disable glycin whilst we have no recipe yet
+# Disable the thumbnailers as they don't build in cross
+EXTRA_OEMESON = "-Dglycin=disabled -Dthumbnailer=disabled"
+
 # For GIO image type sniffing
 RDEPENDS:${PN} = "shared-mime-info"