From 1e550132280ecf9479b9d24401a13c7f1f3dde76 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 31 Oct 2024 07:28:51 -0400 Subject: [PATCH 1/2] Bump the gdk-pixbuf subproject Use the latest release, 2.42.12. --- subprojects/gdk-pixbuf.wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/gdk-pixbuf.wrap b/subprojects/gdk-pixbuf.wrap index 689b51f427..eb2a337aa5 100644 --- a/subprojects/gdk-pixbuf.wrap +++ b/subprojects/gdk-pixbuf.wrap @@ -2,7 +2,7 @@ directory = gdk-pixbuf url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/gdk-pixbuf.git -revision=aeda644f9690b346de77c8f7fae68f5661801833 +revision = 2.42.12 depth = 1 [provide] From 033b4c5aa2d91cd2d9d6ea9e10fb2111562c10fa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 31 Oct 2024 07:29:18 -0400 Subject: [PATCH 2/2] build: Tweak gdk-pixbuf subproject Use builtin loaders by default, so we don't make everybody figure out how to make gdk-pixbuf find uninstalled loaders. --- meson.build | 2 +- subprojects/gi-docgen.wrap | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a2ce640738..781f6b13af 100644 --- a/meson.build +++ b/meson.build @@ -435,7 +435,7 @@ endif pangocairo_dep = dependency('pangocairo', version: pango_req) pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, - default_options: ['png=enabled', 'jpeg=enabled', 'builtin_loaders=png,jpeg', 'man=false']) + default_options: ['png=enabled', 'jpeg=enabled', 'gif=enabled', 'builtin_loaders=all', 'man=false']) png_dep = dependency('libpng', 'png') tiff_dep = dependency('libtiff-4', 'tiff') jpeg_dep = dependency('libjpeg', 'jpeg') diff --git a/subprojects/gi-docgen.wrap b/subprojects/gi-docgen.wrap index 85c85da16f..f566bf7646 100644 --- a/subprojects/gi-docgen.wrap +++ b/subprojects/gi-docgen.wrap @@ -7,3 +7,4 @@ depth = 1 [provide] program_names = gi-docgen +gi-docgen = dummy_dep