branch master updated: gnu: font-gnu-freefont: Add otf and woff font types.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 5483a2d  gnu: font-gnu-freefont: Add otf and woff font types.
5483a2d is described below

commit 5483a2d0a913fe533744699e9ef5757c6e3f6983
Author: Raghav Gururajan <address@hidden>
AuthorDate: Wed Apr 22 15:07:01 2020 -0400

    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 <address@hidden>
---
 doc/guix.texi              |  2 +-
 gnu/packages/fonts.scm     | 40 ++++++++++++++++++++++++++++++++--------
 gnu/packages/genealogy.scm |  2 +-
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 4787f38..19094c4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1691,7 +1691,7 @@ package in Guix looks for fonts in 
@file{$HOME/.guix-profile}
 by default.  Thus, to allow graphical applications installed with Guix
 to display fonts, you have to install fonts with Guix as well.
 Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and
-@code{font-gnu-freefont-ttf}.
+@code{font-gnu-freefont}.
 
 @cindex @code{fc-cache}
 @cindex font cache
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 9ab5587..34db6ff 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -32,6 +32,7 @@
 ;;; Copyright © 2020 Amin Bandali <address@hidden>
 ;;; Copyright © 2020 Michael Rohleder <address@hidden>
 ;;; Copyright © 2020 John Soo <address@hidden>
+;;; Copyright © 2020 Raghav Gururajan <address@hidden>
 ;;;
 ;;; 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
diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm
index 869f69a..79b24ed 100644
--- a/gnu/packages/genealogy.scm
+++ b/gnu/packages/genealogy.scm
@@ -55,7 +55,7 @@
        ("intltool" ,intltool)))
     (inputs
      `(("cairo" ,cairo)
-       ("font-gnu-freefont-ttf" ,font-gnu-freefont-ttf)
+       ("font-gnu-freefont" ,font-gnu-freefont)
        ("geocode-glib" ,geocode-glib)
        ("gexiv2" ,gexiv2)
        ("ghostscript" ,ghostscript)