From patchwork Sat Jan 8 23:47:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 36171 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 6A16727BBEA; Sat, 8 Jan 2022 23:48:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CCC7E27BBE9 for ; Sat, 8 Jan 2022 23:48:10 +0000 (GMT) Received: from localhost ([::1]:60564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6LRR-0004ZB-UH for patchwork@mira.cbaines.net; Sat, 08 Jan 2022 18:48:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6LRK-0004YW-9w for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6LRK-0008Oo-1R for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6LRJ-0006VX-TN for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53131] [PATCH 1/4] gnu: font-fira-sans: Update to 4.203. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jan 2022 23:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53131@debbugs.gnu.org Cc: Philip McGrath Received: via spool by 53131-submit@debbugs.gnu.org id=B53131.164168566324870 (code B ref 53131); Sat, 08 Jan 2022 23:48:01 +0000 Received: (at 53131) by debbugs.gnu.org; 8 Jan 2022 23:47:43 +0000 Received: from localhost ([127.0.0.1]:48953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LQx-0006SU-4u for submit@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:43 -0500 Received: from mail-qk1-f170.google.com ([209.85.222.170]:42753) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LQt-0006S3-UN for 53131@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:37 -0500 Received: by mail-qk1-f170.google.com with SMTP id r139so10557352qke.9 for <53131@debbugs.gnu.org>; Sat, 08 Jan 2022 15:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=osqeYJ8m1guig8pRYfiZQ1Lk8gtwvlweGMe9ogENOUo=; b=BaTXhmW1GkzGNuL7LOaiaAzanOuMexiRWcr0CrF8otbZifyDNq7aOxJ2Io14oe52HE MvA7QQb68XXMTwup3ISnBH97jRiTbPdqr5GibJMNPoL2in5rkCvPHzpBx35AqeIq4unx ZUfsi/Y5hgK5GHHzkJLGDcSG5xYeefdHVlslHzddjapFcAfoZXukaMGFwb8igGw83VwB Ew03Qbq9ndu0UbBfmNysl0DDFVFkyjSUIq0TMOtEH+rtW0D/nI4KuPA37paTYCz0CmyE lPb7Je55tWhZVsNpKhPh/MZEEHyL0IkvaxpuEpIN0h3ivtn77WYBPVLMuk4MEzc92cIn rykA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=osqeYJ8m1guig8pRYfiZQ1Lk8gtwvlweGMe9ogENOUo=; b=jDsz0edUCRIq05K/16CHW8Dcq3vIjm7fjWp+cz1hINOINJvNiMBsWBSwBiLJRhyImF WlaxOb1ADATlnb5Iv0N2oa7L84Kno9jiiFi3yL2ZFt0FVbcGa06thTBkowRqdeATkpd8 PCuD376wBUgwmJzxT2/eO3yvpa7i3vlP0txgKaGEJeQTCaMkEP2UUl6p/tgXa1a5ZxC0 /QnLP0ELvcdjIbRlfpRi6fJfZ9wgty4eJf2f+luQgC2OcYNeW/B6JpFFw9qv0DBHXgfK sIvuimQbVEHttdpSmonKDbxu9a6ciwNYajg4Usm/OeRrvsw/7khvmlC3/nF5kZrkLVYA 1qJg== X-Gm-Message-State: AOAM531Yabf+UpCIv2QSC7Ty5dnt7FdC/Glq2FHK3mudnPI2vA6vuHMo GwKMFX2WFfDOReJ5dwJtRNuNKaE9tfXIBaPw X-Google-Smtp-Source: ABdhPJzXPcuahltkwxZ8Gq6i+VuZ7mlVVYQl4EaCGVku62PanITi9domU4CyHwzASx+mxIPB5HQa3A== X-Received: by 2002:a05:620a:8cd:: with SMTP id z13mr49634840qkz.304.1641685650133; Sat, 08 Jan 2022 15:47:30 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with UTF8SMTPSA id k9sm1842580qta.48.2022.01.08.15.47.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Jan 2022 15:47:29 -0800 (PST) From: Philip McGrath Date: Sat, 8 Jan 2022 18:47:15 -0500 Message-Id: <20220108234718.150528-1-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220108234449.149435-1-philip@philipmcgrath.com> References: <20220108234449.149435-1-philip@philipmcgrath.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 This is the final version to include corresponding UFO sources. * gnu/packages/fonts.scm (font-fira-sans): Update to 4.203. [source]: Move to new upstream repository. [arguments]: Change to the right variant directory. [synopsis, description]: Rewrite, since Firefox OS was discontinued. --- gnu/packages/fonts.scm | 87 +++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 19 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index df1446380f..dc385b08c4 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2021 Sergiu Ivanov ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Paul A. Patience +;;; Copyright © 2022 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -1039,6 +1040,73 @@ (define-public font-adobe-source-serif-pro Sans Pro family.") (license license:silofl1.1))) +(define-public font-fira-sans + ;; Fira Sans v4.203 (which corresponds to Fira Mono v3.206) is the final + ;; version to include UFO sources. It is the same version packaged by other + ;; notable distributors, including Google Fonts. Note that the "reserved + ;; font name" was removed by the copyright holders. + ;; + ;; The upstream release includes a "Fira Code" which "is Fira Mono 3.206 + ;; with less Line Space (1.0) – does not include programming ligatures". We + ;; do not package that: our 'font-fira-code' package (like e.g. Debian's + ;; "fonts-firacode") is the much better known Fira Code font by Nikita + ;; Prokopov, which is an older, independent adaptation of Fira Mono. For the + ;; historical relationship between them, see: + ;; https://github.com/mozilla/Fira/issues/218 + ;; + ;; For a lengthy discussion of the available sources and versions, + ;; see: https://github.com/LiberalArtist/FiraSans/ + ;; + ;; See also: + ;; - https://github.com/mozilla/Fira/pull/219 + ;; - https://github.com/bBoxType/FiraSans/issues/4#issuecomment-695833327 + (package + (name "font-fira-sans") + (version "4.203") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bBoxType/FiraSans") + (commit "a606927401bcc3951587339fee53aa882856b51b"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r9kb7v9jg83nnxwkl6gx9ix1rng3ksr7v33qrm46qb4fhwsyc2n")))) + (build-system font-build-system) + (arguments + `(#:modules + ((ice-9 match) + (ice-9 regex) + (guix build utils) + (guix build font-build-system)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda* (#:key outputs #:allow-other-keys) + (define-values (pkg-name _version) + (package-name->name+version + (strip-store-file-name (assoc-ref outputs "out")))) + (define variant + (string-capitalize + (match:substring (string-match "fira-([a-z]+)" pkg-name) 1))) + (match (find-files "." (format #f "^Fira_~a_[0-9]" variant) + #:directories? #t) + ((dir) + (chdir dir)))))))) + ;; While the repository has moved, + ;; this specimen still works well as the home-page: + (home-page "https://mozilla.github.io/Fira/") + (synopsis + "Humanist sans-serif with numerous weights emphasizing legibility") + (description "Fira Sans is a humanist sans-serif typeface with an emphasis +on legibility, commissioned by Mozilla from Erik Spiekermann and Ralph du +Carrois. The large family includes 2,709 glyphs in normal, condensed, and +compressed cuts at 11 weights (plus 6 experimental weights), each with +corresponding italics. + +The package @code{font-fira-mono} provides a corresponding monospace cut.") + (license license:silofl1.1))) + (define-public font-fira-mono (package (name "font-fira-mono") @@ -1058,25 +1126,6 @@ (define-public font-fira-mono (description "This is the typeface used by Mozilla in Firefox OS.") (license license:silofl1.1))) -(define-public font-fira-sans - (package - (name "font-fira-sans") - (version "4.202") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mozilla/Fira") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "116j26gdj5g1r124b4669372f7490vfjqw7apiwp2ggl0am5xd0w")))) - (build-system font-build-system) - (home-page "https://mozilla.github.io/Fira/") - (synopsis "Mozilla's Fira Sans Font") - (description "This is the typeface used by Mozilla in Firefox OS.") - (license license:silofl1.1))) - (define-public font-fira-go (package (name "font-fira-go")