From patchwork Fri Jan 24 03:26:59 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: 37650 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 3ADE727BBE2; Fri, 24 Jan 2025 03:24:38 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 1360B27BBE9 for ; Fri, 24 Jan 2025 03:24:36 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbAIh-0006bu-Lw; Thu, 23 Jan 2025 22:24:07 -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 1tbAIf-0006bY-NT for guix-patches@gnu.org; Thu, 23 Jan 2025 22:24:05 -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 1tbAIf-0002UW-7A for guix-patches@gnu.org; Thu, 23 Jan 2025 22:24:05 -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:Subject; bh=RqnHurDQNJmD2md8wHIb2444j/2zKdSSvDDmYyiJIZ4=; b=BJKxyDAaxGQ4SvBjm3Jw4WR/a2d33jY9D/79NkoNnaMNFWBgexkNVRs/uREyqiru3XIN3Ea+xZ7m2eK9snPM3ehq6oNiaToNpaMCIjwIg+VogKBWvqHB6hF9ZUbhTYnMbqSqmwWkmn92VWhbe1njH7lmvIgqdBzFXt+7KWRvFGNHTI74C1OYUy81yUnfNBKBE85HP/owH3obd4wVxdtIDEmd4lsdhmeoBJnEAKQxCd4GcPp+dTdLgX57Otclgq/jhXrPo8jXq452gcxS486Ass9p/9fsfFFGlmsJaT/5y1d7CWc0Bf0zvp6mEVNd4eP3wXm3ae99efhZmgc+i7jJow==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tbAIc-000561-KZ; Thu, 23 Jan 2025 22:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75795] [gnome-team 1/2] gnu: gdk-pixbuf: Respect GUIX_GDK_PIXBUF_MODULE_FILES search path. 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: Fri, 24 Jan 2025 03:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by submit@debbugs.gnu.org id=B.173768903419573 (code B ref -1); Fri, 24 Jan 2025 03:24:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jan 2025 03:23:54 +0000 Received: from localhost ([127.0.0.1]:43093 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tbAIT-00055a-AG for submit@debbugs.gnu.org; Thu, 23 Jan 2025 22:23:53 -0500 Received: from lists.gnu.org ([2001:470:142::17]:35956) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tbAIQ-00055K-EE for submit@debbugs.gnu.org; Thu, 23 Jan 2025 22:23:51 -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 1tbAIL-0006Zy-3z for guix-patches@gnu.org; Thu, 23 Jan 2025 22:23:45 -0500 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tbAIJ-0002SG-6z for guix-patches@gnu.org; Thu, 23 Jan 2025 22:23:44 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id E632A38A2BDE; Fri, 24 Jan 2025 03:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1737689012; bh=RqnHurDQNJmD2md8wHIb2444j/2zKdSSvDDmYyiJIZ4=; h=From:To:Cc:Subject:Date:From; b=izQ5mla2r7a81OqEdohLuvmzeFbXFF6lTnkFEaoDs+bNxZI1D/VydWv+metnsZ6cI YPR6XKOHX6h8CARukawkhFT6gG9r+2mJ95QyPqfGiJ/cZFlOY9Ui06xqFiP5qNEEgK sHOEIo+QXMFftf4YgdPrcSIyNSMOwE2YNy34JeOyQAfXF7/Qiy92rs5J3bNF/FnQBE p57Gu8XubBNMUsIAcWGDQZejrNF4yDfXZRy/bT9epUJ5vcATZERrt/q0Sc710M8RCw rX8ShVxQ8ycsxKzDnTdiumsy2lTlXXMbG52sYA+fLr7gL5SswZHfrOn+EA/8Qdzfos ROt5HBG1WnTkzH17ulSBdfbooLa5iMPKOZRurI3Dk292GO24kpmxNLNJITUa+1hvfp d3gP7/jjuaGykedF2R1kn8V2NJQyWnbfG5orijL1GePky01xQvwNErdkc4unR7uJRm fe1EsJDnaZj+SskGHgd4C/+k8fhkWgYqHtwCZF+1lIzC9b1QUI5ObGq/OoEw53N4uT uTWPKhLIWQvPF6GJ3XVEvDjfJNKl3n5r1QtRJW1ZUDp2ji5r53scI5Ayoc/3wHwWDM zcSgEtMiuxixtU8NWzEizLhAjlbsZXJ5XR76Whny/bynDSdjxDDjjH7vakzOyCFrMR LdRro7fmwikAHP0/flEDd71Y= 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 RPm6N4He1Ukc; Fri, 24 Jan 2025 03:23:28 +0000 (UTC) Received: from localhost (unknown [112.44.100.254]) (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; Fri, 24 Jan 2025 03:23:28 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id f1f659dc; Fri, 24 Jan 2025 03:27:02 +0000 (UTC) Date: Fri, 24 Jan 2025 11:26:59 +0800 Message-ID: <3690118c9d5b8b536faba3909ee8c2fb1eb38cbb.1737689162.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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-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 base-commit: 8acd7541b1ba276580d91650bea0b8933e555ca0 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