bug#27123: fonts: more changes to font-build-system, one follow up commit

bug#27123: fonts: more changes to font-build-system, one follow up commit

[ng0]

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

Patch number two in this series is a recommendation. The code should stand for itself.

The previous patch series forgot to remove one line in dejavu. This fixes it.

[-- Attachment #2: 0001-gnu-font-awesome-Use-font-build-system.patch --]
[-- Type: text/plain, Size: 2665 bytes --]

From 974f0f7357aeea1300634606631603948cc9dd85 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Sun, 28 May 2017 19:33:09 +0000
Subject: [PATCH 1/4] gnu: font-awesome: Use 'font-build-system'.

* gnu/packages/fonts.scm (font-awesome): Switch to 'font-build-system'.
(source)[sha256sum]: The package was updated in place, hash sum changed.
---
 gnu/packages/fonts.scm | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 954c58818..21326ce1b 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
+;;; Copyright © 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
 ;;; Copyright © 2016 Jookia <166291@gmail.com>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
@@ -1073,26 +1073,8 @@ designed to work well in user interface environments.")
                                 name "-" version ".zip"))
             (sha256
              (base32
-              "1frhmw41lnnm9rda2zs202pvfi5vzlrsw4xfp4mswl0qgws61mcd"))))
-   (build-system trivial-build-system)
-   (native-inputs
-    `(("unzip" ,unzip)))
-   (arguments
-    `(#:modules ((guix build utils))
-      #:builder (begin
-                  (use-modules (guix build utils))
-                  (let* ((font-dir (string-append %output
-                                                  "/share/fonts/opentype"))
-                         (source (assoc-ref %build-inputs "source"))
-                         (src-otf-file (string-append "font-awesome-"
-                                                      ,version
-                                                      "/fonts/FontAwesome.otf"))
-                         (dest-otf-file (string-append font-dir "/FontAwesome.otf"))
-                         (unzip (assoc-ref %build-inputs "unzip")))
-                    (setenv "PATH" (string-append unzip "/bin"))
-                    (mkdir-p font-dir)
-                    (system* "unzip" source "-d" ".")
-                    (copy-file src-otf-file dest-otf-file)))))
+              "1m1rfwm4sjkv10j3xd2dhwk286a5912b2zgvc692cmxi5gxs68jf"))))
+   (build-system font-build-system)
    (home-page "http://fontawesome.io")
    (synopsis "Font that contains a rich iconset")
    (description
-- 
2.13.0


[-- Attachment #3: 0002-gnu-font-awesome-Use-github-source.patch --]
[-- Type: text/plain, Size: 1468 bytes --]

From 72635f3ca0130ec72414da8c2bcae74bb11f0ed2 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Sun, 28 May 2017 19:33:11 +0000
Subject: [PATCH 2/4] gnu: font-awesome: Use github source.

* gnu/packages/fonts.scm (font-awesome)[source]: Switch to the source on github as the previous zip file
is updated in place, resulting in a changed hash sum.
---
 gnu/packages/fonts.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 21326ce1b..3806e5054 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1069,11 +1069,12 @@ designed to work well in user interface environments.")
    (version "4.7.0")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://fontawesome.io/assets/"
-                                name "-" version ".zip"))
+            (uri (string-append "https://github.com/FortAwesome/Font-Awesome/"
+                                "archive/v" version ".tar.gz"))
+            (file-name (string-append name "-" version ".tar.gz"))
             (sha256
              (base32
-              "1m1rfwm4sjkv10j3xd2dhwk286a5912b2zgvc692cmxi5gxs68jf"))))
+              "0hsxn06kycz9brizpzvnv1qqkwdkfkg2qdyfpwmkibfyw6h2nlfy"))))
    (build-system font-build-system)
    (home-page "http://fontawesome.io")
    (synopsis "Font that contains a rich iconset")
-- 
2.13.0


[-- Attachment #4: 0003-gnu-font-dejavu-Fix-the-switch-to-font-build-system.patch --]
[-- Type: text/plain, Size: 912 bytes --]

From a87d914dec0fe6206efb259fc13c4d2a6101c43a Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Sun, 28 May 2017 19:33:12 +0000
Subject: [PATCH 3/4] gnu: font-dejavu: Fix the switch to 'font-build-system'.

This is a follow-up to commit 2e8840194121be6042502f363f143a4faeceb00e.

* gnu/packages/fonts.scm (font-dejavu): Remove 'trivial-build-system' line.
---
 gnu/packages/fonts.scm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 3806e5054..310613c89 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -107,7 +107,6 @@ TrueType (TTF) files.")
              (sha256
               (base32
                "1mqpds24wfs5cmfhj57fsfs07mji2z8812i5c4pi5pbi738s977s"))))
-    (build-system trivial-build-system)
     (build-system font-build-system)
     (arguments
      `(#:phases
-- 
2.13.0


[-- Attachment #5: 0004-gnu-font-liberation-Use-font-build-system.patch --]
[-- Type: text/plain, Size: 2222 bytes --]

From 4c755af01c83db5fba9a243d9f5f6a328ad2a3d3 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@no-reply.pragmatique.xyz>
Date: Sun, 28 May 2017 19:33:13 +0000
Subject: [PATCH 4/4] gnu: font-liberation: Use 'font-build-system'.

* gnu/packages/fonts.scm (font-liberation): Switch to 'font-build-system'.
---
 gnu/packages/fonts.scm | 29 +----------------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 310613c89..2f7c7cf9f 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -231,34 +231,7 @@ sans-serif designed for on-screen reading.  It is used by GNOME@tie{}3.")
               (sha256
                (base32
                 "010m4zfqan4w04b6bs9pm3gapn9hsb18bmwwgp2p6y6idj52g43q"))))
-    (build-system trivial-build-system)
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-
-         (let ((tar      (string-append (assoc-ref %build-inputs "tar")
-                                        "/bin/tar"))
-               (PATH     (string-append (assoc-ref %build-inputs "gzip")
-                                        "/bin"))
-               (font-dir (string-append %output "/share/fonts/truetype"))
-               (doc-dir  (string-append %output "/share/doc/" ,name)))
-           (setenv "PATH" PATH)
-           (system* tar "xvf" (assoc-ref %build-inputs "source"))
-           (mkdir-p font-dir)
-           (mkdir-p doc-dir)
-           (chdir (string-append "liberation-fonts-ttf-" ,version))
-           (for-each (lambda (ttf)
-                       (install-file ttf font-dir))
-                     (find-files "." "\\.ttf$"))
-           (for-each (lambda (doc)
-                       (install-file doc doc-dir))
-                     '("AUTHORS" "ChangeLog" "LICENSE" "README" "TODO"))))))
-    (native-inputs
-     `(("source" ,source)
-       ("tar" ,tar)
-       ("gzip" ,gzip)))
+    (build-system font-build-system)
     (home-page "https://pagure.io/liberation-fonts/")
     (synopsis
      "Fonts compatible with Arial, Times New Roman, and Courier New")
-- 
2.13.0

bug#27123: fonts: more changes to font-build-system, one follow up commit

[Arun Isaac]

Thanks for the patches! Patches 1, 3 and 4 LGTM.

Patch 2...

> * gnu/packages/fonts.scm (font-awesome)[source]: Switch to the source on github as the previous zip file
> is updated in place, resulting in a changed hash sum.

This commit message line is too long. On emacs, you can wrap it to the
next line with `fill-paragraph'.

The contents of the zip archive are updated in place without changing
the version number? Is that what you mean by "in place"?

Should we treat this as a one-time accident by upstream? Or have they
made a habit out of this?

IMO, we should forgive them this one time, and if they do this again,
then we can move to their github release archive. WDYT?

bug#27123: fonts: more changes to font-build-system, one follow up commit

[ng0]

Arun Isaac transcribed 0.7K bytes:
> 
> Thanks for the patches! Patches 1, 3 and 4 LGTM.

Ok.

> Patch 2...
> 
> > * gnu/packages/fonts.scm (font-awesome)[source]: Switch to the source on github as the previous zip file
> > is updated in place, resulting in a changed hash sum.
> 
> This commit message line is too long. On emacs, you can wrap it to the
> next line with `fill-paragraph'.

Yeah, git commit message has no limit, otherwise I wrap at 70.

> The contents of the zip archive are updated in place without changing
> the version number? Is that what you mean by "in place"?
> 
> Should we treat this as a one-time accident by upstream? Or have they
> made a habit out of this?
> 
> IMO, we should forgive them this one time, and if they do this again,
> then we can move to their github release archive. WDYT?
> 

It looks like this is done regulary, at least from their setup.

The 'assets' directory on the website where the zip file is
contained in comes from the tar.gz source.
I don't really think this patch should be applied, but we
should monitor the situation.
-- 
ng0
OpenPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588

bug#27123: fonts: more changes to font-build-system, one follow up commit

[Arun Isaac]

> It looks like this is done regulary, at least from their setup.

Ok.

> The 'assets' directory on the website where the zip file is
> contained in comes from the tar.gz source.

> I don't really think this patch should be applied, but we
> should monitor the situation.

Sure!

bug#27123: fonts: more changes to font-build-system, one follow up commit

[Arun Isaac]

Pushed!