diff options
| author | Raghav Gururajan <raghavgururajan@disroot.org> | 2020-04-22 15:07:01 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2020-04-22 17:59:44 -0400 |
| commit | 5483a2d0a913fe533744699e9ef5757c6e3f6983 (patch) | |
| tree | 19e012b519e4cc629d096bff23a2a0f08132216d /gnu/packages/fonts.scm | |
| parent | 9fb2b7eeabba2eb2215f03dd0df408203124e527 (diff) | |
| download | patches-5483a2d0a913fe533744699e9ef5757c6e3f6983.tar patches-5483a2d0a913fe533744699e9ef5757c6e3f6983.tar.gz | |
gnu: font-gnu-freefont: Add otf and woff font types.
* gnu/packages/fonts.scm (font-gnu-freefont): Add otf and woff font types.
* gnu/packages/genealogy.scm (gramps)[inputs]: Replace font-gnu-freefont-tff
with font-gnu-freefont.
* doc/guix.texi: Adjust a reference to the package.
Signed-off-by: Leo Famulari <leo@famulari.name>
Diffstat (limited to 'gnu/packages/fonts.scm')
| -rw-r--r-- | gnu/packages/fonts.scm | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9ab5587b98..34db6ff3ec 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2020 Amin Bandali <bandali@gnu.org> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> +;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -232,9 +233,9 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over 50 Cyrillic-based languages as well as Greek and IPA phonetics.") (license license:silofl1.1))) -(define-public font-gnu-freefont-ttf +(define-public font-gnu-freefont (package - (name "font-gnu-freefont-ttf") + (name "font-gnu-freefont") (version "20120503") (source (origin (method url-fetch) @@ -251,18 +252,41 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (lambda _ (let ((doc-dir (string-append %output "/share/doc/" ,name "-" ,version)) - (font-dir (string-append %output - "/share/fonts/truetype"))) + (ttf-font-dir (string-append %output + "/share/fonts/ttf")) + (otf-font-dir (string-append %output + "/share/fonts/otf")) + (woff-font-dir (string-append %output + "/share/fonts/woff"))) (mkdir-p doc-dir) (substitute* "Makefile" (("\\$\\(TMPDIR\\)") doc-dir) - (("sfd/\\*.ttf") "")) - (system* "make" "ttftar") - (mkdir-p font-dir) + (("sfd/\\*.ttf") "") + (("sfd/\\*.otf") "") + (("sfd/\\*.woff") "")) + ;; XXX The FreeFont Makefile tries to use the current + ;; time and date as names for generated files, and fails + ;; silently. But the fonts are still installed, so we + ;; leave the issue alone for now. + ;; See <https://bugs.gnu.org/40783> + (system* "make" "ttftar" "otftar" "wofftar") + (mkdir-p ttf-font-dir) + (mkdir-p otf-font-dir) + (mkdir-p woff-font-dir) (for-each (lambda (file) - (install-file file font-dir)) + (install-file file ttf-font-dir)) (filter (lambda (file) (string-suffix? "ttf" file)) + (find-files "." ""))) + (for-each (lambda (file) + (install-file file otf-font-dir)) + (filter + (lambda (file) (string-suffix? "otf" file)) + (find-files "." ""))) + (for-each (lambda (file) + (install-file file woff-font-dir)) + (filter + (lambda (file) (string-suffix? "woff" file)) (find-files "." ""))))))) #:test-target "tests")) ;; replace python 3 with python 2 |