From patchwork Thu Jan 23 06:28:56 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: 37614 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 5B29E27BBEA; Thu, 23 Jan 2025 06:27:17 +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=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 C4F1B27BBE2 for ; Thu, 23 Jan 2025 06:27:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1taqgC-0007Gv-J9; Thu, 23 Jan 2025 01:27:04 -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 1taqgA-0007GX-MW for guix-patches@gnu.org; Thu, 23 Jan 2025 01:27:02 -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 1taqgA-0002hP-DW for guix-patches@gnu.org; Thu, 23 Jan 2025 01:27: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:References:In-Reply-To:Date:From:To:Subject; bh=iW6DWUNIyYz7AiD8GJkZPx1WZkQvMslIC/UCNYZE1Ng=; b=EX87ZaGo63hZvi/R83F7UCNUglc+D1vJ0m8OleCeuilgO0NoOYHESRblSQ+im/gZ62VbGdl19AhfWDdicRrv5cyhPPRS8RsPjSfpcTbtSj+XhPvm5syecYw2VCHSM5VccEeoWE24NpWlkIB5RaUfFdv5WhNhA1zhvM9rOo5bEWJpGJvScBu793QoYcDi1xmIj9wSWj2+hDCcq78PQ9uhqWJWsbCvCboAINgxmf7MnLyM/QN+YJdS+RS0RfURNq39rXWMpSlMmy5eFjo7esBtqHb9YwvlpRl5eQC2vAa55Wo+4I/flcQ82Z6+8fnaLb7SwbejsZ8ACMFSyUUnwQYKXQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1taqgA-0007Vw-74; Thu, 23 Jan 2025 01:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75688] [PATCH v2 2/4] 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: Thu, 23 Jan 2025 06:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75688 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75688@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 75688-submit@debbugs.gnu.org id=B75688.173761356428759 (code B ref 75688); Thu, 23 Jan 2025 06:27:02 +0000 Received: (at 75688) by debbugs.gnu.org; 23 Jan 2025 06:26:04 +0000 Received: from localhost ([127.0.0.1]:38739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taqfD-0007Tm-SY for submit@debbugs.gnu.org; Thu, 23 Jan 2025 01:26:04 -0500 Received: from mail.envs.net ([5.199.136.28]:52144) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1taqf5-0007Si-I0 for 75688@debbugs.gnu.org; Thu, 23 Jan 2025 01:25:57 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id A687E38A3E50; Thu, 23 Jan 2025 06:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1737613554; bh=iW6DWUNIyYz7AiD8GJkZPx1WZkQvMslIC/UCNYZE1Ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SdzJcvTNsYcU+vNQWblC8o9II4EAkgdy7hIEtKO62tDn0lsJQY9V8oyH/yEy08jz3 qFak4vzU6Os+gA48kiFqBGYPGpihZz/zBJ0h2Jw3/5ZXfojuQOkeEasszWv2suxjQK 9AmAm5+1+dYEidn8ZQr5ftQJI5yx5UP0T98HiXYRqihkV+SX/HQ3glcmvQxfuAmZZG rxO4ZWvq05aHEvYqpEygN2rSTfA+mXlVPObuoRWOZ2rvcbJkgt3YF8tXPs2bEt2LsX fr1rpnnVOpFLK3mBe2QBcY7ySzdzfhFwVRJVVkULUyDfbbyzLzYfIefSZBbjEj9ikK uenKqkMdZBbx1bbP67RSbhXmLo9CsTYjcNF0CkPRIKFDKUrfZQgkW/VGVex1OHSW2F s/UTSvAW/LUhjhe9LXLPfhLvo+lnCJxE5ESy32h6qL3NKEMH3TbY3AreunH/KCv3Ji m7qZrqTZO7TdR84FQ3zPtmCgzGGVe/IaYw6mEnQ8y9U0gqP8K1ya4ZiWBFIozwgJYm Zy2LXc+JIQ8TWmPbUIzbKhCY60IRFWmCxgXMi4y2cGYVNEDZwUbWDR/DdBKY4YogdM JNrh2xXtXIK1G2HepQyU2GoUo/WU+hEn97iNvd1UhVsxYVr8oq0BDn2BfpOJIC76Yc iv4IlnMcw2lEvgVzUN7X7SkQ= 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 KolnuEgFa8nR; Thu, 23 Jan 2025 06:25:51 +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; Thu, 23 Jan 2025 06:25:51 +0000 (UTC) Received: from localhost.localdomain (localhost.lan [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8b562cf9; Thu, 23 Jan 2025 06:29:11 +0000 (UTC) Date: Thu, 23 Jan 2025 14:28:56 +0800 Message-ID: <96be080084ef425fb5d5a8ab920d30667dc68c99.1737613671.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <916f2d3087c47d6212682656f47a2899ba795df1.1737613671.git.iyzsong@member.fsf.org> References: <916f2d3087c47d6212682656f47a2899ba795df1.1737613671.git.iyzsong@member.fsf.org> 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-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * 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: I63ce8fa14799e04551522e6d27e89bf47b08043e Reviewed-by: Maxim Cournoyer --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 8 +++++--- ...-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch | 18 ++++++++++++++++++ 3 files changed, 24 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 6bb3a35770..4249476dfa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1400,6 +1400,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-elogind-support.patch \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7ed7d7b7df..392734a33c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -726,7 +726,10 @@ (define-public gdk-pixbuf name "-" version ".tar.xz")) (sha256 (base32 - "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf")))) + "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf")) + (patches + (search-patches + "gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch")))) (build-system meson-build-system) (outputs '("out" "debug")) (arguments @@ -777,9 +780,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..eb22761403 --- /dev/null +++ b/gnu/packages/patches/gdk-pixbuf-respect-GUIX_GDK_PIXBUF_MODULE_FILES.patch @@ -0,0 +1,18 @@ +diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c +index e1df590..ba24cf6 100644 +--- a/gdk-pixbuf/gdk-pixbuf-io.c ++++ b/gdk-pixbuf/gdk-pixbuf-io.c +@@ -670,6 +670,13 @@ gdk_pixbuf_io_init (void) + gboolean ret; + + gdk_pixbuf_io_init_builtin (); ++ ++ /* Load loaders from GUIX_GDK_PIXBUF_MODULE_FILES. */ ++ gchar **guix_module_files = g_build_guix_search_path_dirs ("GUIX_GDK_PIXBUF_MODULE_FILES"); ++ 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