diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gtk.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 454f4b5acb7..25b8f7bc886 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -650,7 +650,7 @@ highlighting and other features typical of a source code editor.") (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.42.12") + (version "2.44.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -658,7 +658,7 @@ highlighting and other features typical of a source code editor.") name "-" version ".tar.xz")) (sha256 (base32 - "1iz392vrlrnb92hrak697bgndsbkrcxhqxilxn6f99xr8ls5nl5r")) + "05xxpl3sd37lsp5qqy01m0w9c14dqfi84x9rawsffyj2y71sm8ck")) (patches (search-patches "gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch")))) @@ -670,6 +670,8 @@ highlighting and other features typical of a source code editor.") ,@(if (%current-target-system) '() '("-Dgtk_doc=true")) + ;; Prevent cycle between glycin and gdk-pixbuf. + "-Dglycin=disabled" ;; GTK+ 3 needs the XPM loader, see ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/7143>. "-Dothers=enabled") diff --git a/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch b/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch index 4e97d3aa5bc..0fd91703a39 100644 --- a/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch +++ b/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch @@ -14,11 +14,10 @@ diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index e1df590..913ce89 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c -@@ -670,6 +670,17 @@ gdk_pixbuf_io_init (void) - gboolean ret; +@@ -707,6 +707,16 @@ gdk_pixbuf_io_init (void) gdk_pixbuf_io_init_builtin (); -+ + + /* Load modules from GUIX_GDK_PIXBUF_MODULE_FILES. */ + gchar *module_files_env = g_getenv ("GUIX_GDK_PIXBUF_MODULE_FILES"); + if (module_files_env) { @@ -29,6 +28,5 @@ index e1df590..913ce89 100644 + g_strfreev (module_files); + } + - #ifdef USE_GMODULE - module_file = gdk_pixbuf_get_module_file (); - #endif + return file_formats != NULL; + } |