[bug#75795,gnome-team,v2,1/2] gnu: gdk-pixbuf: Honor GUIX_GDK_PIXBUF_MODULE_FILES search path.

Message ID 112469ef967a464b64dd552a70b8af6e19d8766c.1737951075.git.iyzsong@member.fsf.org
State New
Headers
Series [bug#75795,gnome-team,v2,1/2] gnu: gdk-pixbuf: Honor GUIX_GDK_PIXBUF_MODULE_FILES search path. |

Commit Message

Alexis Praga via Guix-patches via Jan. 27, 2025, 4:27 a.m. UTC
  From: 宋文武 <iyzsong@member.fsf.org>

This fixes <https://issues.guix.gnu.org/75523>.

* 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
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gtk.scm                          |  8 ++++---
 ...f-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch | 22 +++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch


base-commit: 0c2ff81ca3673c93d72c7caf7c5e8f03b385110e
  

Comments

Maxim Cournoyer Jan. 27, 2025, 5:10 a.m. UTC | #1
Hello,

iyzsong@envs.net writes:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> This fixes <https://issues.guix.gnu.org/75523>.
>
> * 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

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
  
Maxim Cournoyer Jan. 27, 2025, 5:11 a.m. UTC | #2
Hi again,

I forgot one comment.

iyzsong@envs.net writes:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> This fixes <https://issues.guix.gnu.org/75523>.
>
> * 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
> ---
>  gnu/local.mk                                  |  1 +
>  gnu/packages/gtk.scm                          |  8 ++++---
>  ...f-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch | 22 +++++++++++++++++++
>  3 files changed, 28 insertions(+), 3 deletions(-)
>  create mode 100644 gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index ca7ff0a89a..56cf534ac3 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1398,6 +1398,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/gd-fix-tests-on-i686.patch		\
>    %D%/packages/patches/gd-brect-bounds.patch			\
>    %D%/packages/patches/gdb-hurd64.patch				\
> +  %D%/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch	\
>    %D%/packages/patches/gdm-default-session.patch		\
>    %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch	\
>    %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch	\
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index fac94e293b..011a1db687 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -725,7 +725,10 @@ (define-public gdk-pixbuf
>                                    name "-" version ".tar.xz"))
>                (sha256
>                 (base32
> -                "1iz392vrlrnb92hrak697bgndsbkrcxhqxilxn6f99xr8ls5nl5r"))))
> +                "1iz392vrlrnb92hrak697bgndsbkrcxhqxilxn6f99xr8ls5nl5r"))
> +              (patches
> +               (search-patches
> +                "gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch"))))
>      (build-system meson-build-system)
>      (outputs '("out" "debug"))
>      (arguments
> @@ -779,9 +782,8 @@ (define-public gdk-pixbuf
>       ;; This file is produced by the gdk-pixbuf-loaders-cache-file
>       ;; profile hook.
>       (list (search-path-specification
> -            (variable "GDK_PIXBUF_MODULE_FILE")
> +            (variable "GUIX_GDK_PIXBUF_MODULE_FILES")
>              (files (list %gdk-pixbuf-loaders-cache-file))
> -            (separator #f)              ;single valued
>              (file-type 'regular))))
>      (synopsis "Image loading library")
>      (description "GdkPixbuf is a library that loads image data in various
> 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..ff2eadb6c8
> --- /dev/null
> +++ b/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch
> @@ -0,0 +1,22 @@
> +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

Please add some text at the top of the diff explaining what it does,
perhaps with a

Upstream-status: N/A

tag to denote it's not meant to be forwarded to upstream (as it's Guix-specific).
  
宋文武 Jan. 27, 2025, 11:06 a.m. UTC | #3
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:

>> [...]
>> --- /dev/null
>> +++ b/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch
>> @@ -0,0 +1,22 @@
>> +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
>
> Please add some text at the top of the diff explaining what it does,
> perhaps with a
>
> Upstream-status: N/A
>
> tag to denote it's not meant to be forwarded to upstream (as it's Guix-specific).

Thanks.  v3 patch just sent to address this.
  

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index ca7ff0a89a..56cf534ac3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1398,6 +1398,7 @@  dist_patch_DATA =						\
   %D%/packages/patches/gd-fix-tests-on-i686.patch		\
   %D%/packages/patches/gd-brect-bounds.patch			\
   %D%/packages/patches/gdb-hurd64.patch				\
+  %D%/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch	\
   %D%/packages/patches/gdm-default-session.patch		\
   %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch	\
   %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch	\
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index fac94e293b..011a1db687 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -725,7 +725,10 @@  (define-public gdk-pixbuf
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1iz392vrlrnb92hrak697bgndsbkrcxhqxilxn6f99xr8ls5nl5r"))))
+                "1iz392vrlrnb92hrak697bgndsbkrcxhqxilxn6f99xr8ls5nl5r"))
+              (patches
+               (search-patches
+                "gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch"))))
     (build-system meson-build-system)
     (outputs '("out" "debug"))
     (arguments
@@ -779,9 +782,8 @@  (define-public gdk-pixbuf
      ;; This file is produced by the gdk-pixbuf-loaders-cache-file
      ;; profile hook.
      (list (search-path-specification
-            (variable "GDK_PIXBUF_MODULE_FILE")
+            (variable "GUIX_GDK_PIXBUF_MODULE_FILES")
             (files (list %gdk-pixbuf-loaders-cache-file))
-            (separator #f)              ;single valued
             (file-type 'regular))))
     (synopsis "Image loading library")
     (description "GdkPixbuf is a library that loads image data in various
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..ff2eadb6c8
--- /dev/null
+++ b/gnu/packages/patches/gdk-pixbuf-honor-GUIX_GDK_PIXBUF_MODULE_FILES.patch
@@ -0,0 +1,22 @@ 
+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