From patchwork Wed Oct 27 04:51:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 34099 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 4456327BBE3; Wed, 27 Oct 2021 05:56:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F131427BBE1 for ; Wed, 27 Oct 2021 05:56:12 +0100 (BST) Received: from localhost ([::1]:41144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfayy-0004nq-33 for patchwork@mira.cbaines.net; Wed, 27 Oct 2021 00:56:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfax0-0001yR-Cl for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfax0-0003pm-47 for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfax0-0005Ae-3F for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 18/20] gnu: gdk-pixbuf: Add a search path for the loaders cache file. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Oct 2021 04:54:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51428 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 51428@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 51428-submit@debbugs.gnu.org id=B51428.163531042019701 (code B ref 51428); Wed, 27 Oct 2021 04:54:10 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:40 +0000 Received: from localhost ([127.0.0.1]:48156 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawV-00057c-Kx for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:39 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:41660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawB-00054h-QE for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:24 -0400 Received: by mail-qv1-f48.google.com with SMTP id gh1so1009798qvb.8 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=faSj/yY6YLijfO/oM9e4GqCFWGcijsze0z1f31L7cDg=; b=lhANQakIqbOnKLIkLtBcyeiXHILEC8TnC9odDXJgv7fCnlUJwxq+x8hnFhgNbD/aJ3 ZePn77c5gfR8oSreqRh4NQ6DFm1Uep6LI4Z42hIgyM5CQDKm275Qnp7JQG/ehVb4Y5yR nGS3aidrAA4FdcMKvfJfIJ+57nO59z+GXpYQRqRBvy3VLcMxgHfiTQ0vyv3PMecEzeq/ fydnh43e2dLjNLvC3qkdarnsozBhJKx/0qzrpOYU520snakram8/84vzC9nCoWs9j4Ay 6/47+kZb+3T+gb606ioPmkL0iendbInh4zc33w19V4cHec0x1Cb4Fy176LrRf1mr+sDg k6Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=faSj/yY6YLijfO/oM9e4GqCFWGcijsze0z1f31L7cDg=; b=VeHtsoqE0GYYpb5bxYu1kO9R9yncx/1xq8+oHd8KI/iTwHd8J3hFanFStWpw2hA6gS HLksjiiMWvY+kbfed2vL6uq/D12P4TyMcKwMzqtppJFo9V3LFdPihJzsKrXGZVmMJBNk 3DmqieM/j0YJsMncsHrOAraS4rjbJEesM477Dm70JprGtcfU6DPaL6y0Z/g5VCrpsawH 368wIDoU2iOJ1mLD1wX7elnyIMQXTjfRsiybmMgxgO1V9tRPk2ZnGd2HoF0J6QpVUmtw g4GYRaLvcptkg1mX92rbeygPKmOZYJrXfj2E8szep1vVsLXzFavUTBF2Cya4njJdqoSk hZWQ== X-Gm-Message-State: AOAM531Yi5cFL4i9b80Ybqr8Wjekt10GfB5Gby3ximvnf6CByInbURPb QMfbWdNt8Ewa3Z+zmripWax5tdKHe4E= X-Google-Smtp-Source: ABdhPJz4ZgLwoEd5QKhrB52q9bbWXImM65ALJCZlCFUu/+hEGpFySUJKHdyroGG7jTJnZLjv9nMxmA== X-Received: by 2002:a05:6214:1d21:: with SMTP id f1mr16461242qvd.6.1635310394141; Tue, 26 Oct 2021 21:53:14 -0700 (PDT) Received: from localhost.localdomain (dsl-10-133-98.b2b2c.ca. [72.10.133.98]) by smtp.gmail.com with ESMTPSA id bk13sm11868197qkb.58.2021.10.26.21.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:13 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:49 -0400 Message-Id: <20211027045151.9889-18-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211027045151.9889-1-maxim.cournoyer@gmail.com> References: <20211027045151.9889-1-maxim.cournoyer@gmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Fixes . The previous commit added a profile hook to compute a gdk-pixbuf loaders cache file. This change enables gdk-pixbuf to make use of it. * gnu/packages/gtk.scm (gdk-pixbuf)[native-search-paths]: Add a search path specification to set the GDK_PIXBUF_MODULE_FILE environment variable. --- gnu/packages/gtk.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 22106c1185..0463e26246 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -52,6 +52,8 @@ (define-module (gnu packages gtk) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix build utils) #:select (alist-replace)) + #:use-module ((guix build glib-or-gtk-build-system) + #:select (%gdk-pixbuf-loaders-cache-file)) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -697,6 +699,14 @@ (define-public gdk-pixbuf ("perl" ,perl) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) + (native-search-paths + ;; This file is produced by the gdk-pixbuf-loaders-cache-file + ;; profile hook. + (list (search-path-specification + (variable "GDK_PIXBUF_MODULE_FILE") + (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 formats and stores it as linear buffers in memory. The buffers can then be