Merge branch 'for-main' into 'main'

Bump the gdk-pixbuf subproject See merge request GNOME/gtk!7888
2024-10-31 15:00:28 +00:00
parent ac37d66bd5 033b4c5aa2
commit 9f714a9d0a
3 changed files with 3 additions and 2 deletions
--- 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')
--- 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]
--- 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