From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dF5HG-0005NB-9o for guix-patches@gnu.org; Sun, 28 May 2017 16:59:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dF5HC-0005Jn-Cj for guix-patches@gnu.org; Sun, 28 May 2017 16:59:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39464) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dF5HC-0005JK-9M for guix-patches@gnu.org; Sun, 28 May 2017 16:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dF5HC-0001m5-3H for guix-patches@gnu.org; Sun, 28 May 2017 16:59:02 -0400 Subject: bug#27123: fonts: more changes to font-build-system, one follow up commit Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dF5GY-0005B5-55 for guix-patches@gnu.org; Sun, 28 May 2017 16:58:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dF5GU-00059Q-8T for guix-patches@gnu.org; Sun, 28 May 2017 16:58:22 -0400 Received: from aibo.runbox.com ([91.220.196.211]:58608) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dF5GT-00057B-T1 for guix-patches@gnu.org; Sun, 28 May 2017 16:58:18 -0400 Received: from [10.9.9.210] (helo=mailfront10.runbox.com) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1dF5GS-00089H-AY for guix-patches@gnu.org; Sun, 28 May 2017 22:58:16 +0200 Received: from [62.102.148.67] (helo=localhost) by mailfront10.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1dF5G9-000678-6C for guix-patches@gnu.org; Sun, 28 May 2017 22:57:57 +0200 Date: Sun, 28 May 2017 20:57:54 +0000 From: ng0 Message-ID: <20170528205754.53cta22ho7ddmjnd@abyayala> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="jfucwwfh3t6c5g6r" Content-Disposition: inline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27123@debbugs.gnu.org --jfucwwfh3t6c5g6r Content-Type: text/plain; charset=utf-8 Content-Disposition: inline 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. --jfucwwfh3t6c5g6r Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-gnu-font-awesome-Use-font-build-system.patch" Content-Transfer-Encoding: quoted-printable =46rom 974f0f7357aeea1300634606631603948cc9dd85 Mon Sep 17 00:00:00 2001 =46rom: ng0 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 =C2=A9 2015 Eric Dvorsak ;;; Copyright =C2=A9 2015, 2017 Ricardo Wurmus ;;; Copyright =C2=A9 2015, 2016 Leo Famulari -;;; Copyright =C2=A9 2016, 2017 ng0 +;;; Copyright =C2=A9 2016, 2017 ng0 ;;; Copyright =C2=A9 2016 Jookia <166291@gmail.com> ;;; Copyright =C2=A9 2016 Eric Bavier ;;; Copyright =C2=A9 2016 Dmitry Nikolaev @@ -1073,26 +1073,8 @@ designed to work well in user interface environments= =2E") 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 "/FontAwes= ome.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 --=20 2.13.0 --jfucwwfh3t6c5g6r Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0002-gnu-font-awesome-Use-github-source.patch" Content-Transfer-Encoding: quoted-printable =46rom 72635f3ca0130ec72414da8c2bcae74bb11f0ed2 Mon Sep 17 00:00:00 2001 =46rom: ng0 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 gi= thub 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 environment= s.") (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-Aweso= me/" + "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") --=20 2.13.0 --jfucwwfh3t6c5g6r Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0003-gnu-font-dejavu-Fix-the-switch-to-font-build-system.patch" Content-Transfer-Encoding: quoted-printable =46rom a87d914dec0fe6206efb259fc13c4d2a6101c43a Mon Sep 17 00:00:00 2001 =46rom: ng0 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 --=20 2.13.0 --jfucwwfh3t6c5g6r Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0004-gnu-font-liberation-Use-font-build-system.patch" Content-Transfer-Encoding: quoted-printable =46rom 4c755af01c83db5fba9a243d9f5f6a328ad2a3d3 Mon Sep 17 00:00:00 2001 =46rom: ng0 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") --=20 2.13.0 --jfucwwfh3t6c5g6r--