mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-06-12 12:04:04 +02:00
gnu: gdk-pixbuf: Update to 2.44.4.
* gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.44.4. [#:configure-flags]: Add “-Dglycin=disabled”. * gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch: Adjust accordingly.
This commit is contained in:
committed by
Andreas Enge
parent
8464195ef1
commit
472e264ad6
@@ -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")
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user