unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 50358@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#50358] [PATCH core-updates-frozen 8/8] gnu: fontconfig: Add a search path for XDG_DATA_DIRS.
Date: Fri,  3 Sep 2021 11:31:16 -0400	[thread overview]
Message-ID: <20210903153116.22517-8-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20210903153116.22517-1-maxim.cournoyer@gmail.com>

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 8e0980dd95..9a5cdc1cb6 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -327,14 +327,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)
@@ -356,12 +355,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
@@ -393,6 +387,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
-- 
2.33.0





  parent reply	other threads:[~2021-09-03 15:36 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-03 15:29 [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Maxim Cournoyer
2021-09-03 15:31 ` [bug#50358] [PATCH core-updates-frozen 1/8] guix: packages: Fix repacking of plain tarballs Maxim Cournoyer
2021-09-03 15:31   ` [bug#50358] [PATCH core-updates-frozen 2/8] aux-files: sitecustomize: Cleanup and add explanatory comments Maxim Cournoyer
2021-09-03 15:31   ` [bug#50358] [PATCH core-updates-frozen 3/8] gnu: glade3: Remove sitecustomize.py workaround Maxim Cournoyer
2021-09-03 15:31   ` [bug#50358] [PATCH core-updates-frozen 4/8] gnu: rust: Bootstrap rust from 1.39.0 and optimize build time Maxim Cournoyer
2021-09-03 15:31   ` [bug#50358] [PATCH core-updates-frozen 5/8] gnu: rust: Add rust 1.54 and move all non-bootstrapping logic to it Maxim Cournoyer
2021-09-14 23:40     ` Thiago Jung Bauermann via Guix-patches via
2021-09-22  1:42       ` [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Maxim Cournoyer
2021-09-28  4:05         ` Thiago Jung Bauermann via Guix-patches via
2021-09-03 15:31   ` [bug#50358] [PATCH core-updates-frozen 6/8] gnu: Build all Rust packages using the latest rustc Maxim Cournoyer
2021-09-03 15:31   ` [bug#50358] [PATCH core-updates-frozen 7/8] gnu: mozjs-78: Update to 78.13.0 Maxim Cournoyer
2021-09-03 15:31   ` Maxim Cournoyer [this message]
2021-09-08 16:35     ` [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Ludovic Courtès
2021-09-12  2:56       ` Maxim Cournoyer
2021-09-13  8:24         ` Ludovic Courtès
2021-09-15  4:32           ` Maxim Cournoyer
2021-09-16 19:56             ` Ludovic Courtès
2021-09-03 18:47   ` [bug#50358] [PATCH core-updates-frozen 1/8] guix: packages: Fix repacking of plain tarballs Mathieu Othacehe
2021-09-08 16:27   ` [bug#50358] [PATCH core-updates-frozen 0/8] Shortened Rust bootstrap & other fixes Ludovic Courtès
2021-09-12  2:49     ` Maxim Cournoyer
2021-10-15  5:48 ` John Kehayias via Guix-patches via
2021-11-12  5:57 ` bug#50358: " Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210903153116.22517-8-maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=50358@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).