GNU bug report logs - #75795
[gnome-team 1/2] gnu: gdk-pixbuf: Respect GUIX_GDK_PIXBUF_MODULE_FILES search path.

Previous Next

Package: guix-patches;

Reported by: iyzsong <at> envs.net

Date: Fri, 24 Jan 2025 03:24:02 UTC

Severity: normal

Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 75795 in the body.
You can then email your comments to 75795 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, vivien <at> planete-kraus.eu, guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Fri, 24 Jan 2025 03:24:02 GMT) Full text and rfc822 format available.
Acknowledgement sent to iyzsong <at> envs.net:
New bug report received and forwarded. Copy sent to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, vivien <at> planete-kraus.eu, guix-patches <at> gnu.org. (Fri, 24 Jan 2025 03:24:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: guix-patches <at> gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Fri, 24 Jan 2025 11:26:59 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

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

* gnu/packages/patches/gdk-pixbuf-respect-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 ++++---
 ...respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 72b27cb915..21f04f8a51 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1395,6 +1395,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-respect-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..97d5ca98d0 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-respect-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-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch b/gnu/packages/patches/gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch
new file mode 100644
index 0000000000..d47a54bef1
--- /dev/null
+++ b/gnu/packages/patches/gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch
@@ -0,0 +1,21 @@
+diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
+index e1df590..214a283 100644
+--- a/gdk-pixbuf/gdk-pixbuf-io.c
++++ b/gdk-pixbuf/gdk-pixbuf-io.c
+@@ -670,6 +670,16 @@ gdk_pixbuf_io_init (void)
+ 	gboolean ret;
+ 
+ 	gdk_pixbuf_io_init_builtin ();
++
++        /* Load loaders from GUIX_GDK_PIXBUF_MODULE_FILES. */
++        gchar *guix_module_files_env = g_getenv ("GUIX_GDK_PIXBUF_MODULE_FILES");
++        if (guix_module_files_env) {
++            gchar **guix_module_files = g_strsplit (guix_module_files_env, G_SEARCHPATH_SEPARATOR_S, 0);
++            for (int i = 0; guix_module_files[i] != NULL; i++)
++                gdk_pixbuf_io_init_modules (guix_module_files[i], NULL);
++            g_strfreev (guix_module_files);
++        }
++
+ #ifdef USE_GMODULE
+ 	module_file = gdk_pixbuf_get_module_file ();
+ #endif

base-commit: 8acd7541b1ba276580d91650bea0b8933e555ca0
-- 
2.47.1
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Fri, 24 Jan 2025 03:28:02 GMT) Full text and rfc822 format available.

Message #8 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: 75795 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [gnome-team 2/2] services: gdm: Set GUIX_GDK_PIXBUF_MODULE_FILES.
Date: Fri, 24 Jan 2025 11:30:28 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Replace
GDK_PIXBUF_MODULE_FILE with GUIX_GDK_PIXBUF_MODULE_FILES.
* gnu/services/xorg.scm (gdm-shepherd-service): Replace GDK_PIXBUF_MODULE_FILE
with GUIX_GDK_PIXBUF_MODULE_FILES.
---
 gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch | 4 ++--
 gnu/services/xorg.scm                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
index 2c095c8003..5108da33df 100644
--- a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
+++ b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
@@ -1,6 +1,6 @@
 From: Josselin Poiret <dev <at> jpoiret.xyz>
 Date: Tue, 23 Nov 2021 18:39:39 +0000
-Subject: [PATCH] Make GDM pass GDK_PIXBUF_MODULE_FILE to sessions
+Subject: [PATCH] Make GDM pass GUIX_GDK_PIXBUF_MODULE_FILES to sessions
 diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
 index 932c3e8a..a50dcc8c 100644
 --- a/daemon/gdm-launch-environment.c
@@ -9,7 +9,7 @@ index 932c3e8a..a50dcc8c 100644
                  "WINDOWPATH",
                  "XCURSOR_PATH",
                  "XDG_CONFIG_DIRS",
-+                "GDK_PIXBUF_MODULE_FILE",
++                "GUIX_GDK_PIXBUF_MODULE_FILES",
                  NULL
          };
          char *system_data_dirs;
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index d3912a7de6..7e179d32b8 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -1293,7 +1293,7 @@ (define (gdm-shepherd-service config)
                          ;; the corresponding line in /etc/profile.
                          "XCURSOR_PATH=/run/current-system/profile/share/icons"
                          (string-append
-                          "GDK_PIXBUF_MODULE_FILE="
+                          "GUIX_GDK_PIXBUF_MODULE_FILES="
                           #$gnome-shell "/" #$%gdk-pixbuf-loaders-cache-file)
                          (string-append
                           "GDM_WAYLAND_SESSION="
-- 
2.47.1
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 01:04:01 GMT) Full text and rfc822 format available.

Message #11 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: iyzsong <at> envs.net
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 75795 <at> debbugs.gnu.org
Subject: Re: [bug#75795] [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 10:03:28 +0900

Hello,

iyzsong <at> envs.net writes:

> From: 宋文武 <iyzsong <at> member.fsf.org>
>
> This fixes <https://issues.guix.gnu.org/75523>.
>
> * gnu/packages/patches/gdk-pixbuf-respect-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.

Sounds good.

[...]

>       (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))))

Neat.

>      (synopsis "Image loading library")
>      (description "GdkPixbuf is a library that loads image data in various
> diff --git a/gnu/packages/patches/gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch b/gnu/packages/patches/gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch
> new file mode 100644
> index 0000000000..d47a54bef1> --- /dev/null
> +++ b/gnu/packages/patches/gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch
> @@ -0,0 +1,21 @@
> +diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
> +index e1df590..214a283 100644
> +--- a/gdk-pixbuf/gdk-pixbuf-io.c
> ++++ b/gdk-pixbuf/gdk-pixbuf-io.c
> +@@ -670,6 +670,16 @@ gdk_pixbuf_io_init (void)
> + 	gboolean ret;
> +
> + 	gdk_pixbuf_io_init_builtin ();
> ++
> ++        /* Load loaders from GUIX_GDK_PIXBUF_MODULE_FILES. */
> ++        gchar *guix_module_files_env = g_getenv ("GUIX_GDK_PIXBUF_MODULE_FILES");
> ++        if (guix_module_files_env) {
> ++            gchar **guix_module_files = g_strsplit (guix_module_files_env, G_SEARCHPATH_SEPARATOR_S, 0);

I'd honor the classic max 80 characters width here.

> ++            for (int i = 0; guix_module_files[i] != NULL; i++)
> ++                gdk_pixbuf_io_init_modules (guix_module_files[i], NULL);
> ++            g_strfreev (guix_module_files);
> ++        }
> ++

The rest looks good to me; but!  Could you please submit to upstream the
above but with s/GUIX_GDK_PIXBUF_MODULE_FILES/GDK_PIXBUF_MODULE_FILES/
and link it in the patch via e.g.:

--8<---------------cut here---------------start------------->8---
Upstream-status: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/NNN
--8<---------------cut here---------------end--------------->8---

This way we can track its status there, rebase if needed or respond to
requests for adjustments.

Eventually we'd have gdk-pixbuf honor GDK_PIXBUF_MODULE_FILES natively,
and apply on top of that our patch to have the GUIX_ prefixed variant.

How does that sound?

-- 
Thanks,
Maxim
Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, vivien <at> planete-kraus.eu, guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 04:24:02 GMT) Full text and rfc822 format available.

Message #14 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: 75795 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [gnome-team v2 1/2] gnu: gdk-pixbuf: Honor
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 12:27:02 +0800

From: 宋文武 <iyzsong <at> 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
+@@ -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

base-commit: 0c2ff81ca3673c93d72c7caf7c5e8f03b385110e
-- 
2.47.1
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 04:24:02 GMT) Full text and rfc822 format available.

Message #17 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: 75795 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [gnome-team v2 2/2] services: gdm: Set GUIX_GDK_PIXBUF_MODULE_FILES.
Date: Mon, 27 Jan 2025 12:27:03 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Replace
GDK_PIXBUF_MODULE_FILE with GUIX_GDK_PIXBUF_MODULE_FILES.
* gnu/services/xorg.scm (gdm-shepherd-service): Replace GDK_PIXBUF_MODULE_FILE
with GUIX_GDK_PIXBUF_MODULE_FILES.
---
 gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch | 4 ++--
 gnu/services/xorg.scm                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
index 2c095c8003..5108da33df 100644
--- a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
+++ b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
@@ -1,6 +1,6 @@
 From: Josselin Poiret <dev <at> jpoiret.xyz>
 Date: Tue, 23 Nov 2021 18:39:39 +0000
-Subject: [PATCH] Make GDM pass GDK_PIXBUF_MODULE_FILE to sessions
+Subject: [PATCH] Make GDM pass GUIX_GDK_PIXBUF_MODULE_FILES to sessions
 diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
 index 932c3e8a..a50dcc8c 100644
 --- a/daemon/gdm-launch-environment.c
@@ -9,7 +9,7 @@ index 932c3e8a..a50dcc8c 100644
                  "WINDOWPATH",
                  "XCURSOR_PATH",
                  "XDG_CONFIG_DIRS",
-+                "GDK_PIXBUF_MODULE_FILE",
++                "GUIX_GDK_PIXBUF_MODULE_FILES",
                  NULL
          };
          char *system_data_dirs;
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index d3912a7de6..7e179d32b8 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -1293,7 +1293,7 @@ (define (gdm-shepherd-service config)
                          ;; the corresponding line in /etc/profile.
                          "XCURSOR_PATH=/run/current-system/profile/share/icons"
                          (string-append
-                          "GDK_PIXBUF_MODULE_FILE="
+                          "GUIX_GDK_PIXBUF_MODULE_FILES="
                           #$gnome-shell "/" #$%gdk-pixbuf-loaders-cache-file)
                          (string-append
                           "GDM_WAYLAND_SESSION="
-- 
2.47.1
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 04:27:02 GMT) Full text and rfc822 format available.

Message #20 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 75795 <at> debbugs.gnu.org
Subject: Re: [bug#75795] [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 12:30:28 +0800

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> writes:

> [...]
>
> The rest looks good to me; but!  Could you please submit to upstream the
> above but with s/GUIX_GDK_PIXBUF_MODULE_FILES/GDK_PIXBUF_MODULE_FILES/
> and link it in the patch via e.g.:
>
> Upstream-status: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/NNN
>
> This way we can track its status there, rebase if needed or respond to
> requests for adjustments.
>
> Eventually we'd have gdk-pixbuf honor GDK_PIXBUF_MODULE_FILES natively,
> and apply on top of that our patch to have the GUIX_ prefixed variant.
>
> How does that sound?

Sure, that'll be great.

I had sent an email to request an account there (can't use its web form
due to networking blocking in my country..), will update the patch
later.

Thank you!
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 05:04:01 GMT) Full text and rfc822 format available.

Message #23 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: iyzsong <at> envs.net
Cc: 宋文武 <iyzsong <at> member.fsf.org>, 75795 <at> debbugs.gnu.org
Subject: Re: bug#75795: [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 14:02:42 +0900

iyzsong <at> envs.net writes:

> From: 宋文武 <iyzsong <at> member.fsf.org>
>
> * gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Replace
> GDK_PIXBUF_MODULE_FILE with GUIX_GDK_PIXBUF_MODULE_FILES.
> * gnu/services/xorg.scm (gdm-shepherd-service): Replace GDK_PIXBUF_MODULE_FILE
> with GUIX_GDK_PIXBUF_MODULE_FILES.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

-- 
Thanks,
Maxim
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 05:11:02 GMT) Full text and rfc822 format available.

Message #26 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: iyzsong <at> envs.net
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 75795 <at> debbugs.gnu.org
Subject: Re: bug#75795: [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 14:10:24 +0900

Hello,

iyzsong <at> envs.net writes:

> From: 宋文武 <iyzsong <at> 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 <at> gmail.com>

-- 
Thanks,
Maxim
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 05:13:02 GMT) Full text and rfc822 format available.

Message #29 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: iyzsong <at> envs.net
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 75795 <at> debbugs.gnu.org
Subject: Re: bug#75795: [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 14:11:58 +0900

Hi again,

I forgot one comment.

iyzsong <at> envs.net writes:

> From: 宋文武 <iyzsong <at> 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).

-- 
Thanks,
Maxim
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 05:13:02 GMT) Full text and rfc822 format available.

Message #32 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: iyzsong <at> envs.net
Cc: 宋文武 <iyzsong <at> member.fsf.org>, 75795 <at> debbugs.gnu.org
Subject: Re: bug#75795: [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 14:12:09 +0900

iyzsong <at> envs.net writes:

> From: 宋文武 <iyzsong <at> member.fsf.org>
>
> * gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Replace
> GDK_PIXBUF_MODULE_FILE with GUIX_GDK_PIXBUF_MODULE_FILES.
> * gnu/services/xorg.scm (gdm-shepherd-service): Replace GDK_PIXBUF_MODULE_FILE
> with GUIX_GDK_PIXBUF_MODULE_FILES.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

-- 
Thanks,
Maxim
Information forwarded to liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com, vivien <at> planete-kraus.eu, guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 11:02:02 GMT) Full text and rfc822 format available.

Message #35 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: 75795 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [gnome-team PATCH v3 1/2] gnu: gdk-pixbuf: Honor
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 19:04:53 +0800

From: 宋文武 <iyzsong <at> 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 | 34 +++++++++++++++++++
 3 files changed, 40 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..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

base-commit: 0c2ff81ca3673c93d72c7caf7c5e8f03b385110e
-- 
2.47.1
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 11:02:03 GMT) Full text and rfc822 format available.

Message #38 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: iyzsong <at> envs.net
To: 75795 <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>
Subject: [gnome-team PATCH v3 2/2] services: gdm: Set
 GUIX_GDK_PIXBUF_MODULE_FILES.
Date: Mon, 27 Jan 2025 19:04:54 +0800

From: 宋文武 <iyzsong <at> member.fsf.org>

* gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch: Replace
GDK_PIXBUF_MODULE_FILE with GUIX_GDK_PIXBUF_MODULE_FILES.
* gnu/services/xorg.scm (gdm-shepherd-service): Replace GDK_PIXBUF_MODULE_FILE
with GUIX_GDK_PIXBUF_MODULE_FILES.
---
 gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch | 4 ++--
 gnu/services/xorg.scm                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
index 2c095c8003..5108da33df 100644
--- a/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
+++ b/gnu/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch
@@ -1,6 +1,6 @@
 From: Josselin Poiret <dev <at> jpoiret.xyz>
 Date: Tue, 23 Nov 2021 18:39:39 +0000
-Subject: [PATCH] Make GDM pass GDK_PIXBUF_MODULE_FILE to sessions
+Subject: [PATCH] Make GDM pass GUIX_GDK_PIXBUF_MODULE_FILES to sessions
 diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
 index 932c3e8a..a50dcc8c 100644
 --- a/daemon/gdm-launch-environment.c
@@ -9,7 +9,7 @@ index 932c3e8a..a50dcc8c 100644
                  "WINDOWPATH",
                  "XCURSOR_PATH",
                  "XDG_CONFIG_DIRS",
-+                "GDK_PIXBUF_MODULE_FILE",
++                "GUIX_GDK_PIXBUF_MODULE_FILES",
                  NULL
          };
          char *system_data_dirs;
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index d3912a7de6..7e179d32b8 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -1293,7 +1293,7 @@ (define (gdm-shepherd-service config)
                          ;; the corresponding line in /etc/profile.
                          "XCURSOR_PATH=/run/current-system/profile/share/icons"
                          (string-append
-                          "GDK_PIXBUF_MODULE_FILE="
+                          "GUIX_GDK_PIXBUF_MODULE_FILES="
                           #$gnome-shell "/" #$%gdk-pixbuf-loaders-cache-file)
                          (string-append
                           "GDM_WAYLAND_SESSION="
-- 
2.47.1
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 11:04:01 GMT) Full text and rfc822 format available.

Message #41 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> envs.net>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 75795 <at> debbugs.gnu.org
Subject: Re: bug#75795: [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 19:06:41 +0800

Maxim Cournoyer <maxim.cournoyer <at> 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.
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Mon, 27 Jan 2025 12:39:01 GMT) Full text and rfc822 format available.

Message #44 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: iyzsong <at> envs.net
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Liliana Marie Prikler <liliana.prikler <at> gmail.com>, 75795 <at> debbugs.gnu.org
Subject: Re: bug#75795: [gnome-team 1/2] gnu: gdk-pixbuf: Respect
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 21:38:33 +0900

iyzsong <at> envs.net writes:

> From: 宋文武 <iyzsong <at> 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 <at> gmail.com>

-- 
Thanks,
Maxim
Reply sent to Liliana Marie Prikler <liliana.prikler <at> gmail.com>:
You have taken responsibility. (Mon, 27 Jan 2025 19:07:01 GMT) Full text and rfc822 format available.
Notification sent to iyzsong <at> envs.net:
bug acknowledged by developer. (Mon, 27 Jan 2025 19:07:01 GMT) Full text and rfc822 format available.

Message #49 received at 75795-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: iyzsong <at> envs.net, 75795-done <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> member.fsf.org>,
 Vivien Kraus <vivien <at> planete-kraus.eu>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#75795] [gnome-team PATCH v3 1/2] gnu: gdk-pixbuf: Honor
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Mon, 27 Jan 2025 20:06:35 +0100

Am Montag, dem 27.01.2025 um 19:04 +0800 schrieb iyzsong <at> envs.net:
> From: 宋文武 <iyzsong <at> 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
> ---
Reworded slightly and pushed to gnome-team.

Thanks
Information forwarded to guix-patches <at> gnu.org:
bug#75795; Package guix-patches. (Tue, 28 Jan 2025 20:22:02 GMT) Full text and rfc822 format available.

Message #52 received at 75795 <at> debbugs.gnu.org (full text, mbox):

From: Simon Streit <simon <at> netpanic.org>
To: 75795 <at> debbugs.gnu.org
Cc: liliana.prikler <at> gmail.com, iyzsong <at> envs.net
Subject: Re: bug#75795: [gnome-team PATCH v3 1/2] gnu: gdk-pixbuf: Honor
 GUIX_GDK_PIXBUF_MODULE_FILES search path.
Date: Tue, 28 Jan 2025 21:21:23 +0100

Hello,

Liliana Marie Prikler <liliana.prikler <at> gmail.com> writes:

> Reworded slightly and pushed to gnome-team.

I couldn't check out gnome-team, so I applied the patches locally to
master and they work well there.  I have icons back again on Debian
Stable.  I can't comment on applying Guix System, as I have not done
this yet.


Thank you.  Kind regards

-- 
Simon
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Wed, 26 Feb 2025 12:24:10 GMT) Full text and rfc822 format available.
Did not alter fixed versions and reopened. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Mon, 03 Mar 2025 00:50:02 GMT) Full text and rfc822 format available.
This bug report was last modified 10 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.