From patchwork Mon Jan 27 11:04:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "King, Spencer via Guix-patches\" via" X-Patchwork-Id: 37776 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 F29FA27BBEA; Mon, 27 Jan 2025 11:02:45 +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=ham 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 5A7DA27BBE2 for ; Mon, 27 Jan 2025 11:02:45 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tcMsd-0002I4-76; Mon, 27 Jan 2025 06:02:11 -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 1tcMsW-0002Go-52 for guix-patches@gnu.org; Mon, 27 Jan 2025 06:02:06 -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 1tcMsV-0008Ox-Sf for guix-patches@gnu.org; Mon, 27 Jan 2025 06:02:03 -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=KVX+2uLcu0afVzBlhv0zT9gI3yAJFEK1Uh7X64EwIcw=; b=EuW2bUQFevccci6Qu6J62xsnp2I27jnV/Cj0euM18zVWxSTFif90DkbJfxfAfAmoVQEAvb1tLPtVMvCWTpYGUxR0vnLSJcEJAVaDFFVawd4iZXF3Cmcn2/mcXL+yTPr4CTk90rmc7VwUkPiXAmBe1wNhw1vhRmD3grCbJgZ19zxpbN4WdjXXbGjm4zx+wyYYxSy7aMk8968OcwsdXu9eZtdWeQY+7FtCJlClRg2C+GBfeYuwQrlJ8/BLWppdftH9xfYttwTryJcec4taBAeu1HrWN0XZ//kS/cPv11fNmyZh6LpR+otmxXfMohJLK3ynDlptWZ9W94x7CxqJQeI6cw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tcMsU-0006dS-T1; Mon, 27 Jan 2025 06:02:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75795] [gnome-team PATCH v3 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 11:02: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.173797568825420 (code B ref 75795); Mon, 27 Jan 2025 11:02:02 +0000 Received: (at 75795) by debbugs.gnu.org; 27 Jan 2025 11:01:28 +0000 Received: from localhost ([127.0.0.1]:59568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcMrw-0006bv-9W for submit@debbugs.gnu.org; Mon, 27 Jan 2025 06:01:28 -0500 Received: from mail.envs.net ([5.199.136.28]:49004) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcMrt-0006be-7m for 75795@debbugs.gnu.org; Mon, 27 Jan 2025 06:01:26 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id AE9D238A3DBF; Mon, 27 Jan 2025 11:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1737975683; bh=KVX+2uLcu0afVzBlhv0zT9gI3yAJFEK1Uh7X64EwIcw=; h=From:To:Cc:Subject:Date:From; b=FC7fZroY637p1mkMFQ/VZNIX07VvJHhnfsYw/1d3oHHtufUVNJ+dcMAAv41RQ5In0 nX1xDBgr3jzODw1kS2yh4Q76dGiSiHdVoO8GlZc7ASy5fAGJ270PV45d/R95IwMQJ/ R55rhu6DhMNM+x/MKUvTbJt3PiGagQ9CbH+FuV/mGV5+VrXJoGWYzo8+KHdxu/u06H wDKMnrldPMGit0avNbMysX4js/jVnjMOb4RNsI5M8+wGOjuSlKWNUvqmhAK7UrmVHg DzXWWrK+d+UjU1tbiUO72inZPfYRggR+mk/xXqafhhhHveLefKxckifg//h0Begjm8 q1STXwvn8F+zU9f0nV3t/kotMP6Zn+zeAunSrjYw4bQM1BawhLMF3nCPvayrtL99dQ gE72VV+Uxad79bjjAL8bG6oDudhbR4kmyh0/oa7y5VFw1gUhGvX5miSIyGiLEoXab+ 0n1rH6RACSL23qYck8iodc34ItxHQYcbAQwwYWEZC/tjWuOTcDogAVa3BBbdx8LhH6 fNig76utylZohv0a5X5BMUGwtweXHsRLDAuHUUG8q2mJAvDna/QVBqhDgtZnGJezjU 9FJh8ptf6rPuVQdiALjQ9AefgMmg/bM20qrQgUeeKjaEf8d2Vixot5W/1h0YFUEPJq 0sFInOFNMc8rewzh5Ndiy7xI= 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 5MPegn0CUXW6; Mon, 27 Jan 2025 11:01:20 +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 11:01:20 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 7943229e; Mon, 27 Jan 2025 11:04:56 +0000 (UTC) Date: Mon, 27 Jan 2025 19:04:53 +0800 Message-ID: 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: "King, Spencer 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 | 34 +++++++++++++++++++ 3 files changed, 40 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..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