From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aI79LqnbeGFfbgAAgWs5BA (envelope-from ) for ; Wed, 27 Oct 2021 06:55:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MN29KqnbeGH8bwAA1q6Kng (envelope-from ) for ; Wed, 27 Oct 2021 04:55:05 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 60ABD2BEAE for ; Wed, 27 Oct 2021 06:55:05 +0200 (CEST) Received: from localhost ([::1]:39658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfaxs-0003gA-IB for larch@yhetil.org; Wed, 27 Oct 2021 00:55:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfax0-0001yQ-4B for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfawz-0003ph-NZ for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mfawz-0005AX-Mh for guix-patches@gnu.org; Wed, 27 Oct 2021 00:54:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51428] [PATCH core-update-frozen 20/20] gnu: librsvg: Preserve 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:09 +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.163531041919695 (code B ref 51428); Wed, 27 Oct 2021 04:54:09 +0000 Received: (at 51428) by debbugs.gnu.org; 27 Oct 2021 04:53:39 +0000 Received: from localhost ([127.0.0.1]:48154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawV-00057U-79 for submit@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:39 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:34733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mfawD-00055A-Bj for 51428@debbugs.gnu.org; Wed, 27 Oct 2021 00:53:21 -0400 Received: by mail-qt1-f171.google.com with SMTP id v17so1415832qtp.1 for <51428@debbugs.gnu.org>; Tue, 26 Oct 2021 21:53:21 -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=Py7GrCxfSIyPCmwBGrxXGQLikbWG/Wb8KOxTGse2YyY=; b=Ixe2wuIZKEBpJvNVlsiG/J+KdruTrTBV9qIU9Oi8Mif9gdKTFESw/9hHQoL25sk3T0 tmBqprIq7KVO25cvFA7VLfNbK9KnYSRK/o8GJ/OP0D1hKw6+12CXqgWEPWZxfzeXl1yv ILjfwNiDiKu+fpXNiCEaqTZYxcAZR0K9YzxB1Uu5bGYidLoYRfgl5jfyF6Uc+KGMCE1W hYVUHxNEgbmannHfrhrCzrApSXo5JFYCal0GqFIwcQXxPEmkfsy1pygPp03crolX05rL 7WvPIDitSuxJKWOch3ozhkaFzb7uuoerbZh2Q8AvagBYNf0bdQzRDmRyfzJXk3qVbaf8 zwlQ== 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=Py7GrCxfSIyPCmwBGrxXGQLikbWG/Wb8KOxTGse2YyY=; b=I8vX96XN+hmNN+pxrtWZvAYloUAlLhLGFvE9icHBXqCHwHMfQWXPPlxcq2OuHWAxAj 5iWr5iuukgmvsi4jXCVL543Vs0YRqZvSIWl8xeMQmrI01PDcOyWZeIMOBYlCSdHRl07e gj4pAm9TgsiShSjdR3arn9LpCFGpciOLLdI/99kqdZmMXbo1Da2CMwRdb6Rc4P7wkdqk AeF1ILtuYj5GCiVaj3KCldm6AAfUSOJG+IVPebXa4RF83o03bJEd+1dloaxSD+IfkfLz 5hD5C8ih8Kwj7Fo+bAT6Kg1Aak3qr3iUUqdoMlNHotXzWjt4b9E9bVuUtChdtuXp/Q3Y qHLw== X-Gm-Message-State: AOAM533iG1UdU4FbY9/gmbbPik2KrXhlkfBey058+/A75CHGE3K520SZ NxS7LRyADDvQPZNe+dJ9tBxlw4pbvfg= X-Google-Smtp-Source: ABdhPJwL/t2SASENPxW1hkSmA1RFlItM7H2C0sed3W+Xc9vF5jSF4F9vRZjclvtKAm7ut+g83r4aTA== X-Received: by 2002:ac8:7f42:: with SMTP id g2mr29061913qtk.286.1635310395754; Tue, 26 Oct 2021 21:53:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 21:53:15 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 27 Oct 2021 00:51:51 -0400 Message-Id: <20211027045151.9889-20-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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635310505; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Py7GrCxfSIyPCmwBGrxXGQLikbWG/Wb8KOxTGse2YyY=; b=a1iMiNq5ArPiR5Q1kQzFNzaf+wEB8fSs53snMFHu5ToX0pR29/OFjJAeTefXzGr9VgJtx+ 27XohLiPhjaf8yAOfnXH7QmS6Ikg+q6yZ3bwXDaP3k+fxesBNyHa/3tjciNPO87peXOra+ c8boM+0qbxf5ohM7JIWVGCTUyqRpsfghGiAgZM0EsKYrVy02y7K1s7H4RiQ8rZU8iKJlS6 aov1CzZrZW+Sk3D6M2/Zjk53m0oYSrfud8YY2v8UdQxMebg8AkdTSh0YhA8XfZUiVg6u35 jKcDxbamtm/w0x4x8wpVIH9ahySPy31lvg7zl7q8I0hkuyi+HWXVea7Zb66fuA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635310505; a=rsa-sha256; cv=none; b=uV6PqtnsRbMrT9IEpRuwaXMlFfuP04jXpCEQo7Fofxb9QzuPVX+HpgtcHSemMoSLKUXfhO M6Q3p9WqdSBs2jPCzlHs76zfYAbd/NpXh37DfBbR5rpV8szc9Wi+mE0Q7Bkir92dIeO9Sc O7z/i9GhmjVnJFX/tBkQuj6pEJdKEhL8wDaOpg2LxX6FPHzHjJI3UUMMlDnFJMRstjf/fL JsT8JqGh48QcqKO+OdAd4idKZOeZj/WXsqRcNm64T4iLa5mrypA4LYCtv2TSfSWYkxritq 9skvD2EJ+zLKSVJcr9OpNJpA1k3v6D6a9fLzgH5QwDsLnSBny77oRg75iOpXqg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ixe2wuIZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Ixe2wuIZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 60ABD2BEAE X-Spam-Score: 4.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: AfTSIvoClJZp Now that we have a search path that honors it on gdk-pixbuf, it is more valuable to keep it. * gnu/packages/gnome.scm (librsvg)[phases]{pre-configure}: Install loaders, cache file to locations derived from %gdk-pixbuf-loaders-cache-file. --- gnu/packages/gnome.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a89cd8e7b4..7556b0cf84 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3487,17 +3487,20 @@ (define-public librsvg (substitute* '("Makefile.am" "Makefile.in") (("--locked") "")))) (add-before 'configure 'pre-configure - (lambda _ + (lambda* (#:key outputs #:allow-other-keys) (substitute* "gdk-pixbuf-loader/Makefile.in" ;; By default the gdk-pixbuf loader is installed under ;; gdk-pixbuf's prefix. Work around that. (("gdk_pixbuf_moduledir = .*$") (string-append "gdk_pixbuf_moduledir = " - "$(prefix)/lib/gdk-pixbuf-2.0/2.10.0/" - "loaders\n")) - ;; Drop the 'loaders.cache' file, it's in gdk-pixbuf+svg. - (("gdk_pixbuf_cache_file = .*$") - "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")))) + "$(prefix)/" + ,(dirname %gdk-pixbuf-loaders-cache-file) "/" + "loaders\n"))) + (substitute* "configure" + (("gdk_pixbuf_cache_file=.*") + (string-append "gdk_pixbuf_cache_file=" + (assoc-ref outputs "out") "/" + ,%gdk-pixbuf-loaders-cache-file "\n"))))) (add-after 'configure 'gnu-configure (lambda* (#:key outputs #:allow-other-keys #:rest args) (apply (assoc-ref gnu:%standard-phases 'configure) -- 2.33.1