From patchwork Wed Apr 22 19:07:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Raghav Gururajan X-Patchwork-Id: 21422 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 66A0727BBE4; Wed, 22 Apr 2020 20:08:10 +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 DFB7427BBE1 for ; Wed, 22 Apr 2020 20:08:09 +0100 (BST) Received: from localhost ([::1]:56300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRKjB-0001au-8T for patchwork@mira.cbaines.net; Wed, 22 Apr 2020 15:08:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39136) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jRKj5-0001aZ-1q for guix-patches@gnu.org; Wed, 22 Apr 2020 15:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jRKj4-0004Le-Al for guix-patches@gnu.org; Wed, 22 Apr 2020 15:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jRKj3-0004LX-UF for guix-patches@gnu.org; Wed, 22 Apr 2020 15:08:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jRKj3-0005Nb-Nw for guix-patches@gnu.org; Wed, 22 Apr 2020 15:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40707] v3 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: Wed, 22 Apr 2020 19:08:01 +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.158758245020636 (code B ref 40707); Wed, 22 Apr 2020 19:08:01 +0000 Received: (at 40707) by debbugs.gnu.org; 22 Apr 2020 19:07:30 +0000 Received: from localhost ([127.0.0.1]:53250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRKiX-0005Mm-OC for submit@debbugs.gnu.org; Wed, 22 Apr 2020 15:07:30 -0400 Received: from knopi.disroot.org ([178.21.23.139]:39216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jRKiV-0005Md-8n for 40707@debbugs.gnu.org; Wed, 22 Apr 2020 15:07:28 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C8FF426360 for <40707@debbugs.gnu.org>; Wed, 22 Apr 2020 21:07:25 +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 cGKddSQSpfaE for <40707@debbugs.gnu.org>; Wed, 22 Apr 2020 21:07:24 +0200 (CEST) Date: Wed, 22 Apr 2020 15:07:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1587582436; bh=UvJVOlnEZs3ssikQH3nMj4h1IKqATlHLFzedw3A4XXI=; h=Date:From:To:Subject; b=Cq1qoVNumL6xI5krOlUJImOqeJpxSIDdKW/1a5mEZrYqMJ6dJFpi9kU1cp3jbUYhY QFRShYeUgEewHpCocG7ogvyRfhWswVyhsnTxWWpImjicNNvFS9gYeTRO4vhluCqlMX skLfCP/C5HjYqEr8nuBPuP6oaHFJTv7mYPhR2nQLIbc1K+gZbQuMX/28VT+S4bN01W 9yqqEkJ1q2fPeKcgs6nnOUlYXZRdfHrLl/KxMV86+fPyLqGuFBdiDxJvf5NQ4th4Je R63hovc0Ivd6/2fb5B5PI4PTb7etiQ42+LMJnb8Sr07ts49tOvfNxclk9EK0KmPuRK Aw+Xj5GSaEMbg== From: Raghav Gururajan Message-ID: <20200422150701.2d110a98.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 ad08ebb65723994dda15d02f23c08ef820c8fd4d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 22 Apr 2020 15:03:07 -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/genealogy.scm (gramps): Replace variable string of gnu-freefont. * doc/guix.texi: Replace variable string of gnu-freefont. --- doc/guix.texi | 2 +- gnu/packages/fonts.scm | 35 +++++++++++++++++++++++++++-------- gnu/packages/genealogy.scm | 2 +- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ef5f68db24..98201fbc26 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1683,7 +1683,7 @@ package in Guix looks for fonts in @file{$HOME/.guix-profile} by default. Thus, to allow graphical applications installed with Guix to display fonts, you have to install fonts with Guix as well. Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and -@code{font-gnu-freefont-ttf}. +@code{font-gnu-freefont}. @cindex @code{fc-cache} @cindex font cache 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