From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41786) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ1LH-0007v8-6U for guix-patches@gnu.org; Sun, 19 Apr 2020 00:14:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQ1LG-0000qU-Ka for guix-patches@gnu.org; Sun, 19 Apr 2020 00:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQ1LG-0000nn-7c for guix-patches@gnu.org; Sun, 19 Apr 2020 00:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQ1LG-0006mt-1w for guix-patches@gnu.org; Sun, 19 Apr 2020 00:14:02 -0400 Subject: [bug#40707] gnu: font-gnu-freefont: Add otf and woff font types. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:41124) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ1Kc-0007uG-TC for guix-patches@gnu.org; Sun, 19 Apr 2020 00:13:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQ1Kc-0005wa-42 for guix-patches@gnu.org; Sun, 19 Apr 2020 00:13:22 -0400 Received: from knopi.disroot.org ([178.21.23.139]:49686) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jQ1Kb-0005iB-Bj for guix-patches@gnu.org; Sun, 19 Apr 2020 00:13:21 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3A1D5268CC for ; Sun, 19 Apr 2020 06:13:17 +0200 (CEST) Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5T7E0CBzSMe5 for ; Sun, 19 Apr 2020 06:13:16 +0200 (CEST) Date: Sun, 19 Apr 2020 00:13:05 -0400 From: Raghav Gururajan Message-ID: <20200419001305.427681a9.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/auFUXMz3bi4Fgjch.RvGwj8" 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: 40707@debbugs.gnu.org --MP_/auFUXMz3bi4Fgjch.RvGwj8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/auFUXMz3bi4Fgjch.RvGwj8 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gnu-font-gnu-freefont-Add-otf-and-woff-font-types.patch >From 0708899aef39921a338b77ebc772607963b89ca4 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 19 Apr 2020 00:06:35 -0400 Subject: [PATCH] gnu: font-gnu-freefont: Add otf and woff font types. * gnu/packages/fonts.scm (font-gnu-freefont): Add otf and woff font types. --- gnu/packages/fonts.scm | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index dbc0c4f9d6..f06f5bcc60 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -230,9 +230,9 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over 50 Cyrillic-based languages as well as Greek and IPA phonetics.") (license license:silofl1.1))) -(define-public font-gnu-freefont-ttf +(define-public font-gnu-freefont (package - (name "font-gnu-freefont-ttf") + (name "font-gnu-freefont") (version "20120503") (source (origin (method url-fetch) @@ -249,18 +249,36 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (lambda _ (let ((doc-dir (string-append %output "/share/doc/" ,name "-" ,version)) - (font-dir (string-append %output - "/share/fonts/truetype"))) + (ttf-font-dir (string-append %output + "/share/fonts/ttf")) + (otf-font-dir (string-append %output + "/share/fonts/otf")) + (woff-font-dir (string-append %output + "/share/fonts/woff"))) (mkdir-p doc-dir) (substitute* "Makefile" (("\\$\\(TMPDIR\\)") doc-dir) - (("sfd/\\*.ttf") "")) - (system* "make" "ttftar") - (mkdir-p font-dir) + (("sfd/\\*.ttf") "") + (("sfd/\\*.otf") "") + (("sfd/\\*.woff") "")) + (system* "make" "ttftar" "otftar" "wofftar") + (mkdir-p ttf-font-dir) + (mkdir-p otf-font-dir) + (mkdir-p woff-font-dir) (for-each (lambda (file) - (install-file file font-dir)) + (install-file file ttf-font-dir)) (filter (lambda (file) (string-suffix? "ttf" file)) + (find-files "." ""))) + (for-each (lambda (file) + (install-file file otf-font-dir)) + (filter + (lambda (file) (string-suffix? "otf" file)) + (find-files "." ""))) + (for-each (lambda (file) + (install-file file woff-font-dir)) + (filter + (lambda (file) (string-suffix? "woff" file)) (find-files "." ""))))))) #:test-target "tests")) ;; replace python 3 with python 2 -- 2.26.1 --MP_/auFUXMz3bi4Fgjch.RvGwj8--