From patchwork Sun Apr 19 04:51:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21356 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 AB2F727BBE1; Sun, 19 Apr 2020 05:53: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 E8AA727BBE4 for ; Sun, 19 Apr 2020 05:53:10 +0100 (BST) Received: from localhost ([::1]:37382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ1x8-0004Kj-CH for patchwork@mira.cbaines.net; Sun, 19 Apr 2020 00:53:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40380) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jQ1x1-0004Ia-Pn for guix-patches@gnu.org; Sun, 19 Apr 2020 00:53:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jQ1x1-0002lJ-1f for guix-patches@gnu.org; Sun, 19 Apr 2020 00:53:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60637) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jQ1x0-0002kG-II for guix-patches@gnu.org; Sun, 19 Apr 2020 00:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jQ1x0-0007gc-FM for guix-patches@gnu.org; Sun, 19 Apr 2020 00:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40707] gnu: Add otf and woff font formats for GNU Freefont. (v2) References: <20200419001305.427681a9.raghavgururajan@disroot.org> In-Reply-To: <20200419001305.427681a9.raghavgururajan@disroot.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 19 Apr 2020 04:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 40707@debbugs.gnu.org Received: via spool by 40707-submit@debbugs.gnu.org id=B40707.158727192929480 (code B ref 40707); Sun, 19 Apr 2020 04:53:02 +0000 Received: (at 40707) by debbugs.gnu.org; 19 Apr 2020 04:52:09 +0000 Received: from localhost ([127.0.0.1]:43950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQ1w9-0007fP-HF for submit@debbugs.gnu.org; Sun, 19 Apr 2020 00:52:09 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jQ1w6-0007fF-Gm for 40707@debbugs.gnu.org; Sun, 19 Apr 2020 00:52:07 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B8F4B23D9D for <40707@debbugs.gnu.org>; Sun, 19 Apr 2020 06:52:04 +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 EXOXK0d9OCrn for <40707@debbugs.gnu.org>; Sun, 19 Apr 2020 06:52:03 +0200 (CEST) Date: Sun, 19 Apr 2020 00:51:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587271923; bh=eBEU5ChxiD8ScVAgZSyjWDpi1rs8JqPxuw5jqtjUmYk=; h=Date:From:To:Subject; b=PhJn8tRBjDK/i3QXbU8dtXxyQ1UiSs8CUOWJY+ScwMPXxd0EO4ofXChPHAEJMbKYS J02V5UKZ97TCEWLL/EU7Ak9htbqUtdK/OuJqs/JWLs3+UdAaoXhrIQZSNJl1JeWjsg ahIiDJhLxYxSUYodwIOscRDWO2uxuGNOYJEwdtQ6i7kI9dYV20jHR9qK4JN8wgnIpS k7CroL10VkIDj85/wxwIOmlWydDjotZwA82uL8wI28hVu0HfniCdhqIRTrNMXXQzX/ QbbTyjh6wBfCgxD+GroHywE8yuAEOB/rV0CIbvJ527uwVF4fPYZyrkH5INMjsP3O1w EDWiTs06lhV8A== From: Raghav Gururajan Message-ID: <20200419005154.311cf90e.raghavgururajan@disroot.org> Mime-Version: 1.0 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 43fa86b94a4f814b5607113e91aa0f82a33ec8f5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 19 Apr 2020 00:47:03 -0400 Subject: [PATCH] gnu: Add otf and woff font formats for GNU Freefont. * gnu/packages/fonts.scm (font-gnu-freefont): Add otf and woff font formats. * gnu/packages/genealogy.scm (gramps): Change input name of GNU Freefont. --- gnu/packages/fonts.scm | 35 +++++++++++++++++++++++++++-------- gnu/packages/genealogy.scm | 2 +- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index dbc0c4f9d6..0356d50c7c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2020 Amin Bandali ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 John Soo +;;; Copyright © 2020 Raghav Gururajan ;;; ;;; This file is part of GNU Guix. ;;; @@ -230,9 +231,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 +250,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 diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm index 869f69add8..79b24ed048 100644 --- a/gnu/packages/genealogy.scm +++ b/gnu/packages/genealogy.scm @@ -55,7 +55,7 @@ ("intltool" ,intltool))) (inputs `(("cairo" ,cairo) - ("font-gnu-freefont-ttf" ,font-gnu-freefont-ttf) + ("font-gnu-freefont" ,font-gnu-freefont) ("geocode-glib" ,geocode-glib) ("gexiv2" ,gexiv2) ("ghostscript" ,ghostscript) -- 2.26.1