me
/
guix
Archived
1
0
Fork 0
Code

gnu: fontconfig: Use 'font-dejavu' and remove replacement. 

* gnu/packages/fontutils.scm (fontconfig)[replacement]: Remove.
[inputs]: Replace GS-FONTS by FONT-DEJAVU.
[arguments]: Adjust accordingly.
(fontconfig/font-dejavu): Remove.
master
Ludovic Courtès 2020-12-08 11:05:41 +01:00
parent 79b31767d0
commit 2dfb16150e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/fontutils.scm
View File

@ -318,12 +318,6 @@ Font Format (WOFF).")
(define-public fontconfig (define-public fontconfig
(package (package
(name "fontconfig") (name "fontconfig")
;; This replacement is not security-related, but works around the fact
;; that gs-fonts are not recognized by newer versions of Pango, causing
;; many applications to fail to find fonts otherwise.
(replacement fontconfig/font-dejavu)
(version "2.13.1") (version "2.13.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -338,16 +332,19 @@ Font Format (WOFF).")
(propagated-inputs `(("expat" ,expat) (propagated-inputs `(("expat" ,expat)
("freetype" ,freetype) ("freetype" ,freetype)
("libuuid" ,util-linux "lib"))) ("libuuid" ,util-linux "lib")))
(inputs `(("gs-fonts" ,gs-fonts))) (inputs
;; We use to use 'gs-fonts' but they are not recognized by newer versions
;; of Pango, causing many applications to fail to find fonts otherwise.
`(("font-dejavu" ,font-dejavu)))
(native-inputs (native-inputs
`(("gperf" ,gperf) `(("gperf" ,gperf)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "--with-cache-dir=/var/cache/fontconfig" (list "--with-cache-dir=/var/cache/fontconfig"
;; register gs-fonts as default fonts ;; register the default fonts
(string-append "--with-default-fonts=" (string-append "--with-default-fonts="
(assoc-ref %build-inputs "gs-fonts") (assoc-ref %build-inputs "font-dejavu")
"/share/fonts") "/share/fonts")
;; Register fonts from user and system profiles. ;; Register fonts from user and system profiles.
@ -380,13 +377,6 @@ high quality, anti-aliased and subpixel rendered text on a display.")
"See COPYING in the distribution.")) "See COPYING in the distribution."))
(home-page "https://www.freedesktop.org/wiki/Software/fontconfig"))) (home-page "https://www.freedesktop.org/wiki/Software/fontconfig")))
(define fontconfig/font-dejavu
(package
(inherit fontconfig)
(inputs
;; XXX: Reuse the name to avoid having to override the configure flags.
`(("gs-fonts" ,font-dejavu)))))
(define-public t1lib (define-public t1lib
(package (package
(name "t1lib") (name "t1lib")