diff options
| author | 宋文武 <[email protected]> | 2025-01-27 19:04:53 +0800 |
|---|---|---|
| committer | Liliana Marie Prikler <[email protected]> | 2025-03-02 20:31:48 +0100 |
| commit | 4838b7b0e94c7636cc2639e3b53d3fe37251fca2 (patch) | |
| tree | bab83a4f4f2d1b802dc67f5e37b64e074ec3ec6a /gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch | |
| parent | 59b343c90c4ebcaa37adb18d537d1a0649c1ff22 (diff) | |
gnu: gdk-pixbuf: Honor GUIX_GDK_PIXBUF_MODULE_FILES search path.
* gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Register patch.
* gnu/packages/gtk.scm (gdk-pixbuf)[source]: Add patch.
[native-search-paths]: Replace GDK_PIXBUF_MODULE_FILE with GUIX_GDK_PIXBUF_MODULE_FILES.
Change-Id: Ibcf6ebf33f5de2c889bc27a88d59a5f444b77906
Fixes: GDK_PIXBUF_MODULE_FILE conflicts on foreign distros
<https://issues.guix.gnu.org/75523>
Reviewed-by: Maxim Cournoyer <[email protected]>
Signed-off-by: Liliana Marie Prikler <[email protected]>
Diffstat (limited to 'gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch')
| -rw-r--r-- | gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch | 34 |
1 files changed, 34 insertions, 0 deletions
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 new file mode 100644 index 0000000000..4e97d3aa5b --- /dev/null +++ b/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch @@ -0,0 +1,34 @@ +This patch makes gdk-pixbuf look for additional modules in a list of files +specified by the environment variable "GUIX_GDK_PIXBUF_MODULE_FILES". + +A similiar patch for "GDK_PIXBUF_MODULE_FILES" had been sent to upstream: + https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/180 + +We use a "GUIX_" prefixed one to avoid breaking foreign programs: + https://issues.guix.gnu.org/63853 + https://issues.guix.gnu.org/75523 + +Upstream-status: N/A +--- +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; + + 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) { ++ gchar **module_files = g_strsplit (module_files_env, ++ G_SEARCHPATH_SEPARATOR_S, 0); ++ for (int i = 0; module_files[i] != NULL; i++) ++ gdk_pixbuf_io_init_modules (module_files[i], NULL); ++ g_strfreev (module_files); ++ } ++ + #ifdef USE_GMODULE + module_file = gdk_pixbuf_get_module_file (); + #endif |