branch master updated: website: Copy fonts for the manual from their Guix package.

[Florian Pelz]

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

pelzflorian pushed a commit to branch master
in repository guix-artwork.

The following commit(s) were added to refs/heads/master by this push:
     new b7ccc5c  website: Copy fonts for the manual from their Guix package.
b7ccc5c is described below

commit b7ccc5cb1b4ec936c00dbd98376c5d2677e60a63
Author: Florian Pelz <pelzflorian@pelzflorian.de>
AuthorDate: Thu Feb 15 13:48:20 2024 +0100

    website: Copy fonts for the manual from their Guix package.
    
    Previously, FiraSans-Regular.ttf was referred to but missing.
    Also this ensures we use font files for which the source is available.
    
    Fixes <https://issues.guix.gnu.org/69123>.
    Reported by Balthazar Potet <balthazarpotet@gmail.com>.
    
    * website/static/base/fonts/FiraSans-Bold.ttf: Remove file.
    * website/.guix.scm (build): Copy all fonts from the Guix package.
---
 website/.guix.scm                           |  15 +++++++++++++--
 website/static/base/fonts/FiraSans-Bold.ttf | Bin 438028 -> 0 bytes
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/website/.guix.scm b/website/.guix.scm
index 6c4e9a8..3d8fdb6 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix web site
 ;;; Copyright © 2017, 2019-2021, 2023-2024 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2019 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2019, 2024 Florian Pelz <pelzflorian@pelzflorian.de>
 ;;;
 ;;; This file is part of the GNU Guix web site.
 ;;;
@@ -33,6 +33,7 @@
 (use-modules (guix) (gnu)
              ((gnu packages base)
               #:select (libc-locales-for-target))
+             (gnu packages fonts)
              (gnu packages guile)
              (gnu packages guile-xyz)
              (gnu packages package-management)
@@ -201,7 +202,17 @@
                           (lambda (port) (read port)))
                         lingua)))
               (symlink "guix.html"
-                       (string-append #$output "/" tag "/index.html")))))))
+                       (string-append #$output "/" tag "/index.html")))
+
+            ;; Include the Fira fonts used in
+            ;; website/static/base/css/manual.css.
+            (mkdir-p (string-append #$output "/static/base/fonts"))
+            (map (lambda (file)
+                   (copy-file (string-append #+font-fira-sans
+                                             "/share/fonts/truetype/" file)
+                              (string-append #$output
+                                             "/static/base/fonts/" file)))
+                 '("FiraSans-Bold.ttf" "FiraSans-Regular.ttf"))))))
 
   (computed-file (string-append "guix-web-site-" lingua)
                  build
diff --git a/website/static/base/fonts/FiraSans-Bold.ttf 
b/website/static/base/fonts/FiraSans-Bold.ttf
deleted file mode 100755
index 95e1660..0000000
Binary files a/website/static/base/fonts/FiraSans-Bold.ttf and /dev/null differ