[core-updates] Remove duplications in fonts by split outputs

  • Open
  • quality assurance status badge
Details
2 participants
  • iyzsong
  • Christopher Baines
Owner
unassigned
Submitted by
iyzsong
Severity
normal
I
I
iyzsong wrote on 21 Apr 12:22 +0200
[PATCH 00/14] Remove duplications in fonts by split outputs
(address . guix-patches@gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
cover.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

Hello, here are some patches for font packages which updates
the install phase in font-build-system for multiple outputs, and
use that for some font packages.

When a font family is provided in different formats (eg: both ttf and
otf), font picker will list duplicated entries. To remove those
duplicated entries, these patches will prefer "otf" over "ttf" files
by using '("out" "ttf")) as package's outputs field, so that otf files
will go into the default "out" output.

I think some good defaults for "out" are:
Prefer "otf" over "ttf", as the otf has better features and smaller size.
Prefer "otb" over "pcf", as pango only support otb as bitmap fonts.
Prefer "otc/ttc" over separated ttf/otf files, as collection has smaller size.
Always use "woff" for web fonts or delete them, those are only used for serving web pages.

The font-build-system change will trigger mass rebuilds due to
fontconfig, so this maybe go into "core-updates" or a separated branch.


Sou Bunnbu (???) (14):
build-system: font: Handle multiple outputs in the install phase.
gnu: font-artifika: Split outputs.
gnu: font-chivo: Split outputs.
gnu: font-ibm-plex: Update to 6.4.0.
gnu: font-ibm-plex: Split outputs.
gnu: font-intel-one-mono: Remove unnecessary 'split-outputs' phase.
gnu: font-canada1500: Split outputs.
gnu: font-linuxlibertine: Split outputs.
gnu: font-libertinus: Split outputs.
gnu: font-recursive: Split outputs.
gnu: font-orbitron: Split outputs.
gnu: font-spleen: Remove unnecessary custom install phase.
gnu: font-scientifica: Remove unnecessary custom install phase.
gnu: font-cormorant: Split outputs.

gnu/packages/fonts.scm | 114 ++++++-------------------------
guix/build/font-build-system.scm | 32 +++++++--
2 files changed, 48 insertions(+), 98 deletions(-)


base-commit: a1d711c92e119f6b5b8e99a620cdba92a4ca3bfb
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 01/14] build-system: font: Handle multiple outputs in the install phase.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
414d9dda0aedde45e5673333f5ad90abbb32cc70.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* guix/build/font-build-system.scm (install): Prefer install files into their
specified outputs (ttf, otf, woff, otb, bdf, pcf, psf).

Change-Id: I2ecd126fe31ce4fc65c59106938e37523b0cc3d2
---
guix/build/font-build-system.scm | 32 +++++++++++++++++++++++++++-----
1 file changed, 27 insertions(+), 5 deletions(-)

Toggle diff (54 lines)
diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm
index e4784bc17d..bd166c4afe 100644
--- a/guix/build/font-build-system.scm
+++ b/guix/build/font-build-system.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017, 2022 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
+;;; Copyright © 2024 ??? <iyzsong@envs.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -48,13 +49,34 @@ (define* (install #:key outputs #:allow-other-keys)
"Install the package contents."
(let* ((out (assoc-ref outputs "out"))
(source (getcwd))
- (fonts (string-append out "/share/fonts")))
- (for-each (cut install-file <> (string-append fonts "/truetype"))
+ (truetype-dir (string-append (or (assoc-ref outputs "ttf") out)
+ "/share/fonts/truetype"))
+ (opentype-dir (string-append (or (assoc-ref outputs "otf") out)
+ "/share/fonts/opentype"))
+ (web-dir (string-append (or (assoc-ref outputs "woff") out)
+ "/share/fonts/web"))
+ (otb-dir (string-append (or (assoc-ref outputs "otb") out)
+ "/share/fonts/misc"))
+ (bdf-dir (string-append (or (assoc-ref outputs "bdf") out)
+ "/share/fonts/misc"))
+ (pcf-dir (string-append (or (assoc-ref outputs "pcf") out)
+ "/share/fonts/misc"))
+ (psf-dir (string-append (or (assoc-ref outputs "psf") out)
+ "/share/consolefonts")))
+ (for-each (cut install-file <> truetype-dir)
(find-files source "\\.(ttf|ttc)$"))
- (for-each (cut install-file <> (string-append fonts "/opentype"))
+ (for-each (cut install-file <> opentype-dir)
(find-files source "\\.(otf|otc)$"))
- (for-each (cut install-file <> (string-append fonts "/web"))
- (find-files source "\\.(woff|woff2)$"))))
+ (for-each (cut install-file <> web-dir)
+ (find-files source "\\.(woff|woff2)$"))
+ (for-each (cut install-file <> otb-dir)
+ (find-files source "\\.otb$"))
+ (for-each (cut install-file <> bdf-dir)
+ (find-files source "\\.bdf$"))
+ (for-each (cut install-file <> pcf-dir)
+ (find-files source "\\.pcf$"))
+ (for-each (cut install-file <> psf-dir)
+ (find-files source "\\.psfu$"))))
(define %standard-phases
(modify-phases gnu:%standard-phases
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 02/14] gnu: font-artifika: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
74b2da97e2a04a4cc09d25fb0fd2f4218227f8a9.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-artifika): New field.

Change-Id: I93d3ee3be92bfcd35d85063aaae70618b4a21038
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index a5c8cfadce..dc2ff48946 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -118,6 +118,7 @@ (define-public font-artifika
(base32
"0nwjm44nys1qz3wyg0mm15gdjpz641xpmsz00n6m8065xrw86q7i"))))
(build-system font-build-system)
+ (outputs '("out" "ttf" "woff"))
(home-page "https://github.com/cyrealtype/Artifika")
(synopsis "Upright italic font")
(description "Artifika is an upright italic font for fashionable display
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 03/14] gnu: font-chivo: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
7c9b3ea1ca45499083ae48513f88daf71c4f852c.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-chivo)[outputs]: New field.

Change-Id: I3034440f6d3d50fbd3e8e95e852596e2a42a1ba0
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index dc2ff48946..99b779df4d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -164,6 +164,7 @@ (define-public font-chivo
(sha256
(base32 "0gdsnflnzwy8ajrk93dxwjashxisln58qcqa6dh4smnk7k0a34qs"))))
(build-system font-build-system)
+ (outputs '("out" "ttf" "woff"))
(home-page "https://fonts.google.com/specimen/Chivo")
(synopsis "The Chivo family of fonts")
(description "Google Chivo Fonts is a grotesque family of fonts, ideal for
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 04/14] gnu: font-ibm-plex: Update to 6.4.0.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
f9f9eae0cfdc0b9382c61a886b0a3d05808826ce.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-ibm-plex): Update to 6.4.0.

Change-Id: I2f8142ceefaacec8f21a09290cd5ad25a4703907
---
gnu/packages/fonts.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 99b779df4d..f5c92fc884 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -176,7 +176,7 @@ (define-public font-chivo
(define-public font-ibm-plex
(package
(name "font-ibm-plex")
- (version "6.1.1")
+ (version "6.4.0")
;; We prefer git-fetch since it lets us get the opentype, truetype and web
;; fonts all in one download. The zip archive releases separate the
;; opentype, truetype and web fonts into three separate archives.
@@ -188,7 +188,7 @@ (define-public font-ibm-plex
(file-name (git-file-name name version))
(sha256
(base32
- "1jxyd0zl7jssn7mwz8x5xvjmw59x4mn82s2kywf9583k1pg949k1"))))
+ "00zbwwcwmq8bv9lvsy5r2an8jf4x0cqzw03i7fgjcmbh0h8a48kl"))))
(build-system font-build-system)
(home-page "https://github.com/IBM/plex")
(synopsis "IBM Plex typeface")
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 05/14] gnu: font-ibm-plex: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
dc301657f15e15e0eada9ade68fe58074b5e2b3e.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-ibm-plex)[outputs]: New field.

Change-Id: Icc0792f81797829cd6235ecee7068da29be642f2
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f5c92fc884..7ec223659e 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -190,6 +190,7 @@ (define-public font-ibm-plex
(base32
"00zbwwcwmq8bv9lvsy5r2an8jf4x0cqzw03i7fgjcmbh0h8a48kl"))))
(build-system font-build-system)
+ (outputs '("out" "ttf" "woff"))
(home-page "https://github.com/IBM/plex")
(synopsis "IBM Plex typeface")
(description "This package provides the Plex font family. It comes in a
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 06/14] gnu: font-intel-one-mono: Remove unnecessary 'split-outputs' phase.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
90d15dd89e1de9d5c5c0473c9a20139e50827931.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-intel-one-mono)[arguments]: Remove field.

Change-Id: I3cf25e8feb8c4ee40616b675ccf109a070d03b51
---
gnu/packages/fonts.scm | 17 -----------------
1 file changed, 17 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 7ec223659e..21fcfb63ce 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -232,23 +232,6 @@ (define-public font-intel-one-mono
"0w9isn8az1k3a3q4m2llwnryy79i5v30dx1hfaf90x0zkj98ky5h"))))
(outputs '("out" "ttf" "woff"))
(build-system font-build-system)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-after 'install 'split-outputs
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out-fonts (string-append (assoc-ref outputs "out")
- "/share/fonts"))
- (ttf-fonts (string-append (assoc-ref outputs "ttf")
- "/share/fonts"))
- (woff-fonts (string-append (assoc-ref outputs "woff")
- "/share/fonts")))
- (mkdir-p ttf-fonts)
- (mkdir-p woff-fonts)
- (rename-file (string-append out-fonts "/truetype")
- (string-append ttf-fonts "/truetype"))
- (rename-file (string-append out-fonts "/web")
- (string-append woff-fonts "/web"))))))))
(home-page "https://github.com/intel/intel-one-mono")
(synopsis "Expressive monospaced font family")
(description
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 08/14] gnu: font-linuxlibertine: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
3842883fe93fff0b0f7e5a13d7197341b1c3e201.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-linuxlibertine)[outputs]: New field.

Change-Id: I37cb4e2b9fe89db70fd40066d92b7a21eff46531
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index a5b8baa6b3..14485bc4c9 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -533,6 +533,7 @@ (define-public font-linuxlibertine
(base32
"0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"))))
(build-system font-build-system)
+ (outputs '("out" "ttf"))
(arguments
`(#:phases
(modify-phases %standard-phases
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 07/14] gnu: font-canada1500: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
da7d7025b9e96edda4cc23ec41f0d667456177ef.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-canada1500)[outputs]: New field.

Change-Id: If09b593e02e2f6ce447256a7561f423f448b5a65
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 21fcfb63ce..a5b8baa6b3 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -308,6 +308,7 @@ (define-public font-canada1500
(base32
"0cdcb89ab6q7b6jd898bnvrd1sifbd2xr42qgji98h8d5cq4b6fp"))))
(build-system font-build-system)
+ (outputs '("out" "ttf"))
(home-page "https://typodermicfonts.com/canada1500/")
(synopsis "Canadian typeface that supports English, French and Aboriginal languages")
(description "Canada1500 is a display typeface originally created for the
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 09/14] gnu: font-libertinus: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
8b8335cc86e0d6519d3358df172d83f76a2d898b.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-libertinus)[outputs]: New field.

Change-Id: Ia8598099fbb3a1b454fff53c09a16ef2070c38f3
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 14485bc4c9..7262add973 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -578,6 +578,7 @@ (define-public font-libertinus
(sha256
(base32 "1xkj993hwkr49q63dd2dnkvdkm9sckxm3zjwhdxsxn21fi80ikic"))))
(build-system font-build-system)
+ (outputs '("out" "woff"))
(home-page "https://github.com/alerque/libertinus")
(synopsis "Font family based on Linux Libertine")
(description
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 10/14] gnu: font-recursive: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
5f5185a1a44fa6ca636686beb4c8efe84375511f.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-recurive)[outputs]: New field.
[arguments]: New field. Add 'remove-separate-statics' phase.

Change-Id: I4ab81efb12ded417724ed103339dac0125110592
---
gnu/packages/fonts.scm | 11 +++++++++++
1 file changed, 11 insertions(+)

Toggle diff (24 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 7262add973..bad5ffffac 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -3746,6 +3746,17 @@ (define-public font-recursive
(base32
"00ns6zwizp0wyxyrf7fxqmxm4gl7ygarxq1mj952h78q1rxdzjyb"))))
(build-system font-build-system)
+ ;; Default to ttf, which has "Rec Mono" for code and variable font.
+ (outputs '("out" "otf" "woff"))
+ (arguments
+ (list
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'install 'remove-separate-statics
+ (lambda _
+ ;; Prefer otc/ttc collection over those seperate files.
+ (delete-file-recursively
+ "Recursive_Desktop/separate_statics/"))))))
(home-page "https://www.recursive.design/")
(synopsis "Variable font family for code & UI")
(description "Recursive Sans & Mono is a variable type family built for
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 11/14] gnu: font-orbitron: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
32936c98cfc4402aeef4c0d06e5198541f69fe18.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-orbitron)[outputs]: New field.

Change-Id: I8e63bbc024c28d9602b7f7a52e9b4e363cb62df9
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index bad5ffffac..c0754d4f03 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -3805,6 +3805,7 @@ (define-public font-orbitron
(base32
"1c6jb7ayr07j1pbnzf3jxng9x9bbqp3zydf8mqdw9ifln1b4ycyf"))))
(build-system font-build-system)
+ (outputs '("out" "ttf" "woff"))
(home-page "https://github.com/theleagueof/orbitron")
(synopsis "Futuristic geometric sans-serif")
(description "Orbitron is a geometric sans-serif typeface intended
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 12/14] gnu: font-spleen: Remove unnecessary custom install phase.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
db623c6f88c093fb6192e60916031a72d27bd396.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-spleen)[arguments]: Remove field.

Change-Id: I731b0b6859f9351632b9faf2f486ee194f7e312a
---
gnu/packages/fonts.scm | 46 ------------------------------------------
1 file changed, 46 deletions(-)

Toggle diff (59 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index c0754d4f03..98ae06818d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -3559,52 +3559,6 @@ (define-public font-spleen
(build-system font-build-system)
(outputs '("out" ;OTB
"bdf" "otf" "pcf" "psf"))
- (arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((otb (assoc-ref outputs "out"))
- (bdf (assoc-ref outputs "bdf"))
- (otf (assoc-ref outputs "otf"))
- (pcf (assoc-ref outputs "pcf"))
- (psf (assoc-ref outputs "psf"))
- (otb-font-dir (string-append (assoc-ref outputs
- "out")
- "/share/fonts/misc"))
- (bdf-font-dir (string-append (assoc-ref outputs
- "bdf")
- "/share/fonts/misc"))
- (otf-font-dir (string-append (assoc-ref outputs
- "otf")
- "/share/fonts/opentype"))
- (pcf-font-dir (string-append (assoc-ref outputs
- "pcf")
- "/share/fonts/misc"))
- (psf-font-dir (string-append (assoc-ref outputs
- "psf")
- "/share/consolefonts")))
- (mkdir-p otb-font-dir)
- (mkdir-p bdf-font-dir)
- (mkdir-p otf-font-dir)
- (mkdir-p pcf-font-dir)
- (mkdir-p psf-font-dir)
- (for-each (lambda (otb)
- (install-file otb otb-font-dir))
- (find-files "." "\\.otb$"))
- (for-each (lambda (bdf)
- (install-file bdf bdf-font-dir))
- (find-files "." "\\.bdf$"))
- (for-each (lambda (otf)
- (install-file otf otf-font-dir))
- (find-files "." "\\.otf$"))
- (for-each (lambda (pcf)
- (install-file pcf pcf-font-dir))
- (find-files "." "\\.pcf$"))
- (for-each (lambda (psf)
- (install-file psf psf-font-dir))
- (find-files "." "\\.psfu$"))) #t)))))
(home-page "https://www.cambus.net/spleen-monospaced-bitmap-fonts/")
(synopsis "Monospaced bitmap font for consoles and terminals")
(description
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 13/14] gnu: font-scientifica: Remove unnecessary custom install phase.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
a97eb0f467ab66c78f91d2b6bbba33f3eae4742a.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-scientifica)[arguments]: Remove field.

Change-Id: Ice422a8604adba6b4a5b31675303f4030c6e35af
---
gnu/packages/fonts.scm | 28 ----------------------------
1 file changed, 28 deletions(-)

Toggle diff (41 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 98ae06818d..447fcd40f9 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -3595,34 +3595,6 @@ (define-public font-scientifica
(build-system font-build-system)
(outputs '("out" ;OTB
"bdf" "ttf"))
- (arguments
- (list #:phases #~(modify-phases %standard-phases
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((otb (assoc-ref outputs "out"))
- (bdf (assoc-ref outputs "bdf"))
- (ttf (assoc-ref outputs "ttf"))
- (otb-font-dir (string-append (assoc-ref
- outputs "out")
- "/share/fonts/misc"))
- (ttf-font-dir (string-append (assoc-ref
- outputs "ttf")
- "/share/fonts/truetype"))
- (bdf-font-dir (string-append (assoc-ref
- outputs "bdf")
- "/share/fonts/misc")))
- (mkdir-p otb-font-dir)
- (mkdir-p bdf-font-dir)
- (mkdir-p ttf-font-dir)
- (for-each (lambda (otb)
- (install-file otb otb-font-dir))
- (find-files "." "\\.otb$"))
- (for-each (lambda (bdf)
- (install-file bdf bdf-font-dir))
- (find-files "." "\\.bdf$"))
- (for-each (lambda (ttf)
- (install-file ttf ttf-font-dir))
- (find-files "." "\\.ttf$"))) #t)))))
(home-page "https://github.com/nerdypepper/scientifica")
(synopsis "Tall and condensed bitmap font for geeks")
(description
--
2.41.0
I
I
iyzsong wrote on 21 Apr 12:28 +0200
[PATCH 14/14] gnu: font-cormorant: Split outputs.
(address . 70496@debbugs.gnu.org)(name . ???)(address . iyzsong@member.fsf.org)
7f3903a5e4d7076232e6ed86e2022263bce95ee7.1713693629.git.iyzsong@member.fsf.org
From: ??? <iyzsong@member.fsf.org>

* gnu/packages/fonts.scm (font-cormorant)[outputs]: New field.

Change-Id: I742de3d380aef62b7c81a70d6d942865b2b7fd58
---
gnu/packages/fonts.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 447fcd40f9..816e3c6f2c 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -3191,6 +3191,7 @@ (define-public font-cormorant
(sha256
(base32 "0fjp2xk4bjx8i6jamkyjq2fdr7324fh41pbn634iwnhdvvawvbav"))))
(build-system font-build-system)
+ (outputs '("out" "ttf" "woff"))
(home-page "https://github.com/CatharsisFonts/Cormorant")
(synopsis
"Extravagant display serif typeface in the spirit of Garamond")
--
2.41.0
C
C
Christopher Baines wrote on 17 May 18:57 +0200
Re: [bug#70496] [PATCH 00/14] Remove duplications in fonts by split outputs
(address . control@debbugs.gnu.org)(address . 70496@debbugs.gnu.org)
87a5koml4n.fsf@cbaines.net
retitle 70496 [core-updates] Remove duplications in fonts by split outputs
thanks
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZHjIhfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xdntg//a4d6Linc9gai6yIKsBvV6jiBayvBWZQR
rVYP3BEdheSlxf/uTSMsebb5wbUL9VWB9BU43e212+HjdfuNR9X18HXKJ/6FFw3X
dZKxJtARMSdNVC/otgqquMkDkPFFKPi7NJukuLMygHp6MYZXGqaBijRGrHqdMbzg
oi4FoRJIz5zYXtA7yjkZPQ/8RxtUOP5wLXBrfKRx/Nzv0RwB5OWYaEJTeVyqvr9z
o+wSLGmCtXtjtFDpscjD8W6wp1LCimH/yYEjDwRlHR/phq0g5eBPfwPIUafLlzL8
oFd66OZ0wCjaFITv5Lj+VnY38bYhLM7bu8ah/WdqVgypnS6Vtt+ULu6N9ayg6fje
ySh+XiSBKF5FBf0KGdhp5LkesjLmW+YOD8jZ97hUYqpUNd20X0v8XP+AwGSZ/Tbe
j8JfxnZRGnn2Uub7QcsHgm11fiiJ6ToDMRABWtMIethnBfDz0bvAyixYc03V9rEF
pWVp+MRJnC5atWZDIW4obUNR055P81RDxXzDryAfqaJOQ2ASpQRVhwpjnjlfKgpm
OstWQqkkouJ7+NerFG2yVzBwdNgfCRB2JHJg9Mazb5FUyawnpe19quo+TyPN13NX
QjdO4QIdrFgLINrf5exPp8k8kX+oSPwTarOIU50p8ysQzTN4ecqioVRbOvFY4nja
eGC2miFPOjY=
=3P9R
-----END PGP SIGNATURE-----

?