[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#51428] [PATCH core-update-frozen 20/20] gnu: librsvg: Preserve the
From: |
Maxim Cournoyer |
Subject: |
[bug#51428] [PATCH core-update-frozen 20/20] gnu: librsvg: Preserve the loaders.cache file. |
Date: |
Wed, 27 Oct 2021 00:51:51 -0400 |
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
- [bug#51428] [PATCH core-update-frozen 03/13] gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., (continued)
- [bug#51428] [PATCH core-update-frozen 03/13] gnu: at-spi2-core: Reverse inheritance relationship with minimal variant., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 09/13] gnu: colord-minimal: Introduce minimal variant., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 04/13] gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 08/13] gnu: Add docbook-xsl-ns., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 07/13] gnu: json-glib-minimal: Introduce minimal variant., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 11/13] gnu: gusb-minimal: Introduce minimal variant., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 12/13] gnu: rest: Use libsoup-minimal., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 10/13] gnu: libcloudproviders-minimal: Introduce minimal variant., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 13/13] gnu: inkscape: Remove the legacy 0.92 version., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 19/20] gnu: gtk: Replace gdk-pixbuf+svg by librsvg., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 20/20] gnu: librsvg: Preserve the loaders.cache file.,
Maxim Cournoyer <=
- [bug#51428] [PATCH core-update-frozen 18/20] gnu: gdk-pixbuf: Add a search path for the loaders cache file., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 06/13] gnu: lsof: Fix indentation., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 16/20] build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 14/20] gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 05/13] gnu: lsof: Disable the LTlock test., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 15/20] gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., Maxim Cournoyer, 2021/10/27
- [bug#51428] [PATCH core-update-frozen 17/20] profiles: Add a gdk-pixbuf-loaders-cache-file hook., Maxim Cournoyer, 2021/10/27