From patchwork Mon Jan 27 04:27:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tusharhero--- via Guix-patches via X-Patchwork-Id: 37767 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CA5C027BBE2; Mon, 27 Jan 2025 04:24:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 96DB627BBE9 for ; Mon, 27 Jan 2025 04:24:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tcGfO-000238-1C; Sun, 26 Jan 2025 23:24:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tcGfL-00022Z-1W for guix-patches@gnu.org; Sun, 26 Jan 2025 23:24:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tcGfK-0000F1-Om for guix-patches@gnu.org; Sun, 26 Jan 2025 23:24:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=6UjQ7x1yn7eZ5hVZlo/JQnfsRiCljCU4yZyl3DhGSPI=; b=D9Et7WCUpHOfpo9mmdpgDN+ugPSSCmiEptXyiUL1DDpIqrT411dh5ALODDl5r843oC8geAzMFW7Ska0rtzytR95rzxQZv7JyAolNdw3726ANsaAEabpWwawzNRvcXJkitBXUb6z6C8bvDJ4czPc4yhuSj/oE2LbjFbG3Alwxa3/1uwwWFhud6gN2EsRd/SFmHK2mb/O648zQETsuESfltJyht0aLONeKzSQnOOrrYDxC+9fwuQOTrCR3PzdLvxKTBvmO+Hw0AEd2md47IMbv9qoiurMS1GgmRUUnttSpac6ogtNw0e0beuZ4562vnCmH+UUwS44Gedw+h/zanr/UOA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tcGfK-0006H1-2g; Sun, 26 Jan 2025 23:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75795] [gnome-team v2 1/2] gnu: gdk-pixbuf: Honor GUIX_GDK_PIXBUF_MODULE_FILES search path. References: <3690118c9d5b8b536faba3909ee8c2fb1eb38cbb.1737689162.git.iyzsong@member.fsf.org> In-Reply-To: <3690118c9d5b8b536faba3909ee8c2fb1eb38cbb.1737689162.git.iyzsong@member.fsf.org> Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 27 Jan 2025 04:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75795 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 75795@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 75795-submit@debbugs.gnu.org id=B75795.173795182324077 (code B ref 75795); Mon, 27 Jan 2025 04:24:02 +0000 Received: (at 75795) by debbugs.gnu.org; 27 Jan 2025 04:23:43 +0000 Received: from localhost ([127.0.0.1]:58730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcGf0-0006GE-Fu for submit@debbugs.gnu.org; Sun, 26 Jan 2025 23:23:42 -0500 Received: from mail.envs.net ([5.199.136.28]:48836) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcGex-0006G1-Im for 75795@debbugs.gnu.org; Sun, 26 Jan 2025 23:23:40 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 6279C38A2C0E; Mon, 27 Jan 2025 04:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1737951818; bh=6UjQ7x1yn7eZ5hVZlo/JQnfsRiCljCU4yZyl3DhGSPI=; h=From:To:Cc:Subject:Date:From; b=Xo8NLaVsElgtL5r6fZyh3qFUr7wMCNLAQWzZ8sGqTXmgS1MyXLDvPGoco6YCknOG+ fRkSIX3Y/tFgxmcblPdtTGYs6gji79i1sF3d/DJpmpSK8/HVnL4U7AHP1J3sgk5KRU MsVh6Y7AcyhI9hhY3lQfcrCP0elF20r2UKVrzNfvm0LHpWFtnu9awVZ+pj3AFna+dA lGgXv4B1itFabimkoQDh2/AI/lFoG4dC2vPqUD8ZXO1xeFmPZqs5WQkwYtt2+7nOp3 kYtADU4ZLXSIz5eUmf8P7UgzMakd2UTsWFu8grrGbPfMTiZmC1pTc+1Q9nEm/a0RiL JXGlbGnZunmzyALLLnvQZ2ukMe7ZWRkmJhGBzZKRD/K3jcFLSSQSsWoQox07frYY2/ m+H8/IUCVIqu4Er9U1Pwheli9XkcUXnPxriWaWRC0VyiODJNvuXjDeW98vBmBI3lmH 4a8PLu+yDBlA9FDOu1WHN+BmjTEKVd4rdOVk5y/abwLyZkwTrYLdy5yjbmh5kFAsGl hth7uP1EwEAz7V/RoVN3aVzxTHdj7WzYUckVOkzEzyVWbwWDV0ebJI7f3opp7a4VYZ ddUDzoZH1ya9z801pCr9+GxlNiPBKqAmkiz5UfVGyW52q7qKNLWxn/dpA8ZhYdbPQ/ IttwvoKmQSwiRHy5B0EEv12A= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6eurflQNOnLC; Mon, 27 Jan 2025 04:23:35 +0000 (UTC) Received: from localhost (unknown [112.44.100.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Mon, 27 Jan 2025 04:23:34 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id ba5d46fe; Mon, 27 Jan 2025 04:27:12 +0000 (UTC) Date: Mon, 27 Jan 2025 12:27:02 +0800 Message-ID: <112469ef967a464b64dd552a70b8af6e19d8766c.1737951075.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: tusharhero--- via Guix-patches via Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: 宋文武 This fixes . * 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 --- 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 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