bug#27172: [PATCH 0/2] Switch font-iosevka to 'font-build-system'.

bug#27172: [PATCH 0/2] Switch font-iosevka to 'font-build-system'.

[Alex Griffin]

A following patch switches font-iosevka to the new font-build-system.
First though, it requires a small change to the build system to support
TrueType Collection (TTC) files.
-- 
Alex Griffin

bug#27172: [PATCH 1/2] build: font: Support TrueType Collection files.

[Alex Griffin]

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]

This patch adds support to the font-build-system for installing TrueType
Collection (TTC) files.
-- 
Alex Griffin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-font-Support-TrueType-Collection-files.patch --]
[-- Type: text/x-patch; name="0001-build-font-Support-TrueType-Collection-files.patch", Size: 1336 bytes --]

From 3af6b0c8259c914136e839d12ab3332a1b9a87ec Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Wed, 31 May 2017 12:16:01 -0500
Subject: [PATCH 1/2] build: font: Support TrueType Collection files.

* guix/build/font-build-system.scm (install): Support TrueType
Collection (TTC) files.  Only use one for-each loop to search for files.
---
 guix/build/font-build-system.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm
index cca1e93f0..326957921 100644
--- a/guix/build/font-build-system.scm
+++ b/guix/build/font-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,9 +51,7 @@ archive, or a font file."
          (source (getcwd))
          (fonts (string-append out "/share/fonts")))
     (for-each (cut install-file <> (string-append fonts "/truetype"))
-              (find-files source "\\.ttf$"))
-    (for-each (cut install-file <> (string-append fonts "/opentype"))
-              (find-files source "\\.otf$"))
+              (find-files source "\\.(ttf|ttc|otf)$"))
     #t))
 
 (define %standard-phases
-- 
2.13.0

bug#27172: [PATCH 1/2] build: font: Support TrueType Collection files.

[Danny Milosavljevic]

On Wed, 31 May 2017 12:38:09 -0500
Alex Griffin <a@ajgrf.com> wrote:
> This patch adds support to the font-build-system for installing TrueType
> Collection (TTC) files.

LGTM!

bug#27172: [PATCH 1/2] build: font: Support TrueType Collection files.

[Danny Milosavljevic]

Disregard this patch.

bug#27172: [PATCH 2/2] gnu: font-iosevka: Use 'font-build-system'.

[Alex Griffin]

[-- Attachment #1: Type: text/plain, Size: 80 bytes --]

This patch switches font-iosevka to the new font-build-system.
-- 
Alex Griffin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-font-iosevka-Use-font-build-system.patch --]
[-- Type: text/x-patch; name="0002-gnu-font-iosevka-Use-font-build-system.patch", Size: 2010 bytes --]

From 05dbe19955883c914f9ec199ca4a26c31eff1074 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Wed, 31 May 2017 12:22:35 -0500
Subject: [PATCH 2/2] gnu: font-iosevka: Use 'font-build-system'.

* gnu/packages/fonts.scm (font-iosevka): Switch to font-build-system.
[source]: Use url-fetch/zipbomb.
[native-inputs]: Remove dependency on unzip.
---
 gnu/packages/fonts.scm | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 76677453d..ef734dfb7 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1213,26 +1213,14 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
     (name "font-iosevka")
     (version "1.12.5")
     (source (origin
-              (method url-fetch)
+              (method url-fetch/zipbomb)
               (uri (string-append
                     "https://github.com/be5invis/Iosevka/releases/download/v"
                     version "/iosevka-pack-" version ".zip"))
               (sha256
                (base32
                 "0s3g6mk0ngwsrw9h9dqinb50cd9i8zhqdcmmh93fhyf4d87yfwyi"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils))
-                   (let ((font-dir (string-append %output
-                                                  "/share/fonts/truetype"))
-                         (source (assoc-ref %build-inputs "source"))
-                         (unzip  (string-append (assoc-ref %build-inputs "unzip")
-                                                "/bin/unzip")))
-                     (mkdir-p font-dir)
-                     (system* unzip "-d" font-dir source)))))
-    (native-inputs `(("unzip" ,unzip)))
+    (build-system font-build-system)
     (home-page "https://be5invis.github.io/Iosevka/")
     (synopsis "Coders' typeface, built from code")
     (description
-- 
2.13.0

bug#27172: [PATCH 2/2] gnu: font-iosevka: Use 'font-build-system'.

[Danny Milosavljevic]

LGTM!

bug#27172: [PATCH 1/2] build: font: Support TrueType Collection files.

[Alex Griffin]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

This is a new version of patch 1 to fix a bug I accidentally introduced.
The first version I submitted introduced a bug where opentype fonts were
installed into the truetype folder.
-- 
Alex Griffin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-font-Support-TrueType-Collection-files.patch --]
[-- Type: text/x-patch; name="0001-build-font-Support-TrueType-Collection-files.patch", Size: 1252 bytes --]

From 9f9d1e671889049758cdff30f8efb7d481d192a6 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Wed, 31 May 2017 12:16:01 -0500
Subject: [PATCH 1/2] build: font: Support TrueType Collection files.

* guix/build/font-build-system.scm (install): Support TrueType
Collection (TTC) files.
---
 guix/build/font-build-system.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm
index cca1e93f0..dc97ffbe8 100644
--- a/guix/build/font-build-system.scm
+++ b/guix/build/font-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,7 +51,7 @@ archive, or a font file."
          (source (getcwd))
          (fonts (string-append out "/share/fonts")))
     (for-each (cut install-file <> (string-append fonts "/truetype"))
-              (find-files source "\\.ttf$"))
+              (find-files source "\\.(ttf|ttc)$"))
     (for-each (cut install-file <> (string-append fonts "/opentype"))
               (find-files source "\\.otf$"))
     #t))
-- 
2.13.0

bug#27172: [PATCH 1/2] build: font: Support font collection files.

[Alex Griffin]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

Sorry, one final revision to my font-build-system patch. A visit to
Wikipedia showed me that OpenType Collection (OTC) files also exist, so
we may as well support them too while we're at it.
-- 
Alex Griffin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-font-Support-font-collection-files.patch --]
[-- Type: text/x-patch; name="0001-build-font-Support-font-collection-files.patch", Size: 1361 bytes --]

From a5bea1fc316c010b127d0c079edfdb52461b96db Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Wed, 31 May 2017 12:16:01 -0500
Subject: [PATCH 1/2] build: font: Support font collection files.

* guix/build/font-build-system.scm (install): Support TrueType
Collection (TTC) and OpenType Collection (OTC) files.
---
 guix/build/font-build-system.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm
index cca1e93f0..f2a646f6f 100644
--- a/guix/build/font-build-system.scm
+++ b/guix/build/font-build-system.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -50,9 +51,9 @@ archive, or a font file."
          (source (getcwd))
          (fonts (string-append out "/share/fonts")))
     (for-each (cut install-file <> (string-append fonts "/truetype"))
-              (find-files source "\\.ttf$"))
+              (find-files source "\\.(ttf|ttc)$"))
     (for-each (cut install-file <> (string-append fonts "/opentype"))
-              (find-files source "\\.otf$"))
+              (find-files source "\\.(otf|otc)$"))
     #t))
 
 (define %standard-phases
-- 
2.13.0

bug#27172: [PATCH 1/2] build: font: Support font collection files.

[Danny Milosavljevic]

LGTM!