[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
94/140: gnu: fontconfig: Add a search path for XDG_DATA_DIRS.
From: |
guix-commits |
Subject: |
94/140: gnu: fontconfig: Add a search path for XDG_DATA_DIRS. |
Date: |
Sun, 17 Oct 2021 23:11:04 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 2319e275126a0e974fb4538e9119ad1c59e54382
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Aug 3 20:49:16 2021 -0400
gnu: fontconfig: Add a search path for XDG_DATA_DIRS.
Fixes <https://issues.guix.gnu.org/31403>.
* gnu/packages/fontutils.scm (fontconfig)[source]: Fix indentation.
[configure-flags]: Drop the "--with-add-fonts" configure option as it's no
longer necessary/desirable to special case the system and user profiles.
[native-search-paths]: New search path.
---
gnu/packages/fontutils.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 053dc18..35e3629 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -326,14 +326,13 @@ Font Format (WOFF).")
(name "fontconfig-minimal")
(version "2.13.94")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://www.freedesktop.org/software/"
- "fontconfig/release/fontconfig-" version ".tar.xz"))
- (sha256
- (base32
- "0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55"))
- (patches (search-patches "fontconfig-cache-ignore-mtime.patch"))))
+ (method url-fetch)
+ (uri (string-append
+ "https://www.freedesktop.org/software/"
+ "fontconfig/release/fontconfig-" version ".tar.xz"))
+ (sha256 (base32
+
"0g004r0bkkqz00mpm3svnnxn7d83158q0yb9ggxryizxfg5m5w55"))
+ (patches (search-patches
"fontconfig-cache-ignore-mtime.patch"))))
(build-system gnu-build-system)
;; In Requires or Requires.private of fontconfig.pc.
(propagated-inputs `(("expat" ,expat)
@@ -355,12 +354,7 @@ Font Format (WOFF).")
;; register the default fonts
(string-append "--with-default-fonts="
(assoc-ref %build-inputs "font-dejavu")
- "/share/fonts")
-
- ;; Register fonts from user and system profiles.
- (string-append "--with-add-fonts="
- "~/.guix-profile/share/fonts,"
- "/run/current-system/profile/share/fonts"))
+ "/share/fonts"))
#:phases
(modify-phases %standard-phases
(add-before 'check 'skip-problematic-tests
@@ -392,6 +386,12 @@ high quality, anti-aliased and subpixel rendered text on a
display.")
; The exact license is more X11-style
than BSD-style.
(license (license:non-copyleft "file://COPYING"
"See COPYING in the distribution."))
+ (native-search-paths
+ ;; Since version 2.13.94, fontconfig knows to find fonts from
+ ;; XDG_DATA_DIRS.
+ (list (search-path-specification
+ (variable "XDG_DATA_DIRS")
+ (files '("share")))))
(home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))))
;;; The documentation of fontconfig is built in a separate package, as it
- 42/140: gnu: gst-plugins-good: Update to 1.19.2., (continued)
- 42/140: gnu: gst-plugins-good: Update to 1.19.2., guix-commits, 2021/10/17
- 70/140: gnu: python-keras: Enable parallel tests., guix-commits, 2021/10/17
- 73/140: bluez: Update to 5.61., guix-commits, 2021/10/17
- 68/140: gnu: gstreamer-docs: Update to 1.18.5., guix-commits, 2021/10/17
- 75/140: gnu: glibc: Remove unneeded nscd patching., guix-commits, 2021/10/17
- 80/140: gnu: diffutils: Update to 3.8., guix-commits, 2021/10/17
- 78/140: gnu: gtk+-2: Fix ‘builder’ test., guix-commits, 2021/10/17
- 85/140: gnu: Add ld-gold-wrapper., guix-commits, 2021/10/17
- 86/140: gnu: gdb: Patch references to /bin/sh and add debug output., guix-commits, 2021/10/17
- 96/140: gnu: python-pypa-build: Update to 0.7.0., guix-commits, 2021/10/17
- 94/140: gnu: fontconfig: Add a search path for XDG_DATA_DIRS.,
guix-commits <=
- 91/140: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/17
- 99/140: gnu: python-setuptools-scm: Update to 6.3.2, guix-commits, 2021/10/17
- 101/140: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/17
- 103/140: build: glib-or-gtk-build-system: Simplify the wrap-all-programs phase., guix-commits, 2021/10/17
- 106/140: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/17
- 109/140: gnu: json-glib-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 112/140: gnu: libcloudproviders-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 111/140: gnu: colord-minimal: Introduce minimal variant., guix-commits, 2021/10/17
- 110/140: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/17
- 128/140: gnu: libsoup: Reverse inheritance relationship with libsoup-minimal., guix-commits, 2021/10/17