From patchwork Sun Apr 19 04:13:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21355 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4938027BBE1; Sun, 19 Apr 2020 05:14:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C10A427BBE4 for ; Sun, 19 Apr 2020 05:14:09 +0100 (BST) Received: from localhost ([::1]:37186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ1LN-0007vU-8o for patchwork@mira.cbaines.net; Sun, 19 Apr 2020 00:14:09 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#40707] gnu: font-gnu-freefont: Add otf and woff font types. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Apr 2020 04:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40707@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158726960526037 (code B ref -1); Sun, 19 Apr 2020 04:14:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Apr 2020 04:13:25 +0000 Received: from localhost ([127.0.0.1]:43942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQ1Kf-0006lt-HE for submit@debbugs.gnu.org; Sun, 19 Apr 2020 00:13:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:45975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQ1Kd-0006ll-Ad for submit@debbugs.gnu.org; Sun, 19 Apr 2020 00:13:24 -0400 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) X-Virus-Scanned: Debian amavisd-new at disroot.org 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587269596; bh=s4xq5N+ir2G94w5Zo2OnMB7kO3Tj4VhzJ0KSk5yFJXg=; h=Date:From:To:Subject; b=aYL9Z+1gZH/SmF9h1mGG0pVB7CW80bDuOZc2uYCa9ellzK1NpiNN0s8siANpax/aa qYV/JZ6HZYKBZqQVXWGGo00E8JcjfxhS1iyZG4n4IwYcctge9Cyd61kINnwjgpNB87 8oTq7+qbIepWdDPSjAcxZypJPVuhEMHU+qoO+f405gVLphXB6ElCfRAoqbgz0W38xu 1sIWpt5Z50G2WF52keP0BDtDhKJPQRObsW6SGaOTfN0T86zj7fiPYOE5B8AqUBA3ZI oKslewAHSwlET/uAr18enVIH0n/mPVbmy+V1iKZ45FmEdKeT2rzek+ukkdtetxHcEG DYfDveoMycVBg== From: Raghav Gururajan Message-ID: <20200419001305.427681a9.raghavgururajan@disroot.org> Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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