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") From patchwork Sat Jan 8 23:47:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 36173 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 880EB27BBEA; Sat, 8 Jan 2022 23:48:19 +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 4566627BBE9 for ; Sat, 8 Jan 2022 23:48:19 +0000 (GMT) Received: from localhost ([::1]:60986 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6LRa-0004r4-GP for patchwork@mira.cbaines.net; Sat, 08 Jan 2022 18:48:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6LRK-0004Yf-V8 for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6LRK-0008Ot-N4 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 1n6LRK-0006Vf-AJ for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53131] [PATCH 2/4] gnu: font-fira-mono: Inherit from font-fira-sans. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jan 2022 23:48:02 +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.164168566324878 (code B ref 53131); Sat, 08 Jan 2022 23:48:02 +0000 Received: (at 53131) by debbugs.gnu.org; 8 Jan 2022 23:47:43 +0000 Received: from localhost ([127.0.0.1]:48956 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LR1-0006T5-Dp for submit@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:43 -0500 Received: from mail-qk1-f174.google.com ([209.85.222.174]:44021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LQx-0006SD-RQ for 53131@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:40 -0500 Received: by mail-qk1-f174.google.com with SMTP id f138so10550049qke.10 for <53131@debbugs.gnu.org>; Sat, 08 Jan 2022 15:47:39 -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=J5Z6ArHThbzdGgaf67RNvJZ/fwHKi4ZjXfOsVoGCl/I=; b=dtnvBbLfaPdoKrCYVEwL7zqiPyu/ASGNyfq9JsSeEc2zxEuP2mAUDsTSqCjA3F1Df6 HCcr4KDqqWrijj4OHg2KYGeAFQVOwdFu31UnVygCTG1Xy5+Lfr4ulB3qbRKauh7elao4 ra2pNerAFi6kOqRF2hRNvFU96krOe7k6do5NT4IoQyXPWy+kxhNv7VJ43EyMQg9/mZqN AAwV3uWEiPo2ckg1yFGgZcgaI4VgljNxzg1/FtyJAkJfXZpkV7Ku0WFB2p5elj1vhbup m7zcNRyVkMnSvnhxeTqCiuc97G2EPx2RFR91lRm3btLXjl8/wOrYD7VeDv0+lRS9Y+5e +7Fg== 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=J5Z6ArHThbzdGgaf67RNvJZ/fwHKi4ZjXfOsVoGCl/I=; b=q/YCsngYQn+Iz4tT2sRp7IXP6zNxLbkIummNoGd5y/FZEYZ5WvuR7Lgu8EEd9nRqYH nQKLAX/Ynu4zKeINx2Jhuuy/T+haaVuomDJBq7bvZgb1di2U18nQbDfHn16fZqaTqkar hY6OJFwoPlhcFAMrNQ7EmV0FwOd50+YfvJb0VJa7IDbj3pAp1A1xnpd5/UDDkwhOAZrC rbAOSGn09Z41O/tB1lNPAPfFG4hVVPbsWYl/kuzrLlnlc4QsA78YFQQo4A7ChiurWxs+ 6NV9ok7fpVLb2K/mVf8XEdboU3FITE+XRiDA82YShbmOF3SefdWKUMwxzdz3fWfpRVdM JVTQ== X-Gm-Message-State: AOAM531MBCLx2fgarFtlhPSCqLcRmwSldf62brSQRZgBtPu6UWI8Cs/t sMvW5xiwuAUQNFMU95/dQg3BP75vysQVMLt+ X-Google-Smtp-Source: ABdhPJxopmOxfUuwB1jL1VOfxG0gyDRIHBVWGoqKaXQ3oIXKvUb9eAG3H6cwYY9vjn+l7TvrZvvpeQ== X-Received: by 2002:a05:620a:d56:: with SMTP id o22mr46796067qkl.753.1641685654312; Sat, 08 Jan 2022 15:47:34 -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 t18sm1810960qkp.84.2022.01.08.15.47.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Jan 2022 15:47:34 -0800 (PST) From: Philip McGrath Date: Sat, 8 Jan 2022 18:47:16 -0500 Message-Id: <20220108234718.150528-2-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220108234718.150528-1-philip@philipmcgrath.com> References: <20220108234449.149435-1-philip@philipmcgrath.com> <20220108234718.150528-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 * gnu/packages/fonts.scm (font-fira-mono)[source, build-system, home-page]: Inherit from font-fira-sans. [synopsis, description]: Rewrite, since Firefox OS was discontinued. --- gnu/packages/fonts.scm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index dc385b08c4..b1b20d7163 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1109,21 +1109,13 @@ (define variant (define-public font-fira-mono (package + (inherit font-fira-sans) (name "font-fira-mono") (version "3.206") - (source (origin - (method url-fetch) - (uri (string-append "https://carrois.com/downloads/fira_mono_3_2/" - "FiraMonoFonts" - (string-replace-substring version "." "") - ".zip")) - (sha256 - (base32 - "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi")))) - (build-system font-build-system) - (home-page "https://mozilla.github.io/Fira/") - (synopsis "Mozilla's monospace font") - (description "This is the typeface used by Mozilla in Firefox OS.") + (synopsis "Monospace cut of Fira Sans") + (description + "Fira Mono is a monospace cut of Fira Sans (see @code{font-fira-sans}). +It includes regular, medium, and bold weights.") (license license:silofl1.1))) (define-public font-fira-go From patchwork Sat Jan 8 23:47:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 36172 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 EDA9E27BBEA; Sat, 8 Jan 2022 23:48:12 +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 AACF827BBE9 for ; Sat, 8 Jan 2022 23:48:12 +0000 (GMT) Received: from localhost ([::1]:60574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6LRS-0004Zk-Rx for patchwork@mira.cbaines.net; Sat, 08 Jan 2022 18:48:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6LRL-0004Yg-1p for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6LRK-0008Oz-PM 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 1n6LRK-0006Vp-Mn for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53131] [PATCH 3/4] gnu: font-fira-code: Update to 6.2. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jan 2022 23:48:02 +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.164168566524898 (code B ref 53131); Sat, 08 Jan 2022 23:48:02 +0000 Received: (at 53131) by debbugs.gnu.org; 8 Jan 2022 23:47:45 +0000 Received: from localhost ([127.0.0.1]:48959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LR2-0006TV-Rn for submit@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:45 -0500 Received: from mail-qk1-f172.google.com ([209.85.222.172]:40713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LR1-0006SS-OH for 53131@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:44 -0500 Received: by mail-qk1-f172.google.com with SMTP id w27so10572040qkj.7 for <53131@debbugs.gnu.org>; Sat, 08 Jan 2022 15:47:43 -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=Dbg4FhGjmpEHSezzlFosvo92IIhbxC8EH+w9W2YCIkI=; b=J/ba2A5edsLag9WGkxiEjo2J3Eaam6OqAN2RrfkRoaPrRkM5NTKO172pNfl80QCJpH +VFbAXbguNYv4+uVisJzJwzcSl21kx4z2z/bcJQURFlopxecf7iho3HSu7EKNg/O3Pf5 boOlApJl0X9S6bflh1CN7nG3I0frH1wcKr5jUyYNwiSOe+pHZ+U0e2mDYsGuwe9Ywr6X T64Sh54wpCbFUsSmdGJLjEfqOY62OOW6vVGg5pQFDZuVWhmz3DO9YocEmasI3V2WgCwp d+ILmNvXrbC4tyniN++S8021alMx6ybF60+EBCrf7OVkPDNulikJxrp51TNB+nxtbMyR HRfQ== 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=Dbg4FhGjmpEHSezzlFosvo92IIhbxC8EH+w9W2YCIkI=; b=Dxj9R1kf+em2xzbhDvpb/nfHtcQ7jNkIG+GwqZgneTdswA1f7/knuwUV7i+BUhLt53 EsLLBmKjkMsN/rjy88kYLe5VS4GZj7lbcM9vclD/CrdXX1Jp0t158wxYBCx6Md66bMu3 zIKHvp1Z7r72hCh69z0jK8aQyGbyzzOOiVDxpzmbn2hGHp7rx3ZHGgDchBF5xXh/af2b MD1N6TqPD+CErp2v/XLvpAtEwhzbrcuhzTRRQJ5EPgLSI+fnXwACU7zXPWgrOVM2VHjv 8uvWbERC9vP5xANQLDdG0wbInf1sIEabQRwVgvF44aVWPLG9p8itHSexiO7Far52nQ0r oI1A== X-Gm-Message-State: AOAM532C/b2cY4gUzORRcZ5fHesU2Sjkx+lpxiKkc7GoTgSyTIy1QvrA u5FRUKmcffIp2OYK7NCPqF+sh4G+BPWdKRKq X-Google-Smtp-Source: ABdhPJw3bw8afM11l+rKVTCjoWhj8PaefM3Kik4c5j7euSXAdY1hflahRpMIVd/KkGeGtNuzErdnMQ== X-Received: by 2002:a05:620a:1722:: with SMTP id az34mr3461250qkb.280.1641685658270; Sat, 08 Jan 2022 15:47:38 -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 t3sm1989160qtc.7.2022.01.08.15.47.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Jan 2022 15:47:38 -0800 (PST) From: Philip McGrath Date: Sat, 8 Jan 2022 18:47:17 -0500 Message-Id: <20220108234718.150528-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220108234718.150528-1-philip@philipmcgrath.com> References: <20220108234449.149435-1-philip@philipmcgrath.com> <20220108234718.150528-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 * gnu/packages/fonts.scm (font-fira-code): Update to 6.2. [home-page]: Change. This font was never affiliated with Mozilla. [description]: Tweak. Fix formatting. --- gnu/packages/fonts.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b1b20d7163..41caa4d5ee 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1142,24 +1142,29 @@ (define-public font-fira-go (define-public font-fira-code (package (name "font-fira-code") - (version "5.2") + (version "6.2") (source (origin + ;; changing to git-fetch would require building from source (method url-fetch/zipbomb) (uri (string-append "https://github.com/tonsky/FiraCode/releases/" "download/" version "/Fira_Code_v" version ".zip")) (sha256 - (base32 "1zayrb6k0gd7xdvx7yx44dpip767q0bzhqwf4j6nf8nx02z746jj")))) + (base32 "0y9y7snyrr30z75kxz2zgh6q6hizcbzsf41xv6gxh97bm1dr2j89")))) (build-system font-build-system) - (home-page "https://mozilla.github.io/Fira/") + ;; This font began as an independent derived work of Fira Mono. + ;; It was never affiliated with Mozilla. + ;; See comments on font-fira-sans for further discussion. + (home-page "https://github.com/tonsky/FiraCode") (synopsis "Monospaced font with programming ligatures") (description - "Fira Code is an extension of the Fira Mono font containing a set of ligatures -for common programming multi-character combinations. This is just a font rendering -feature: underlying code remains ASCII-compatible. This helps to read and understand -code faster. For some frequent sequences like .. or //, ligatures allow us to -correct spacing.") + "Fira Code is a monospace font by Nikita Prokopov featuring ligatures for +common programming multi-character combinations. It began as an extension of +Fira Mono. The ligatures are just a font rendering feature: underlying code +remains ASCII-compatible. They are designed to help people to read and +understand code faster. For some frequent sequences like @code{..} or +@code{//}, ligatures are used to simulate proportional spacing.") (license license:silofl1.1))) (define-public font-awesome From patchwork Sat Jan 8 23:47:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 36174 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 4E74A27BBEA; Sat, 8 Jan 2022 23:48:25 +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 01CCF27BBE9 for ; Sat, 8 Jan 2022 23:48:25 +0000 (GMT) Received: from localhost ([::1]:33014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6LRg-00051O-6e for patchwork@mira.cbaines.net; Sat, 08 Jan 2022 18:48:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6LRL-0004ZA-Fb for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56062) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6LRL-0008PC-6w for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n6LRL-0006Vw-4U for guix-patches@gnu.org; Sat, 08 Jan 2022 18:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53131] [PATCH 4/4] gnu: font-fira-go: Note lack of corresponding source. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jan 2022 23:48:03 +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.164168567924997 (code B ref 53131); Sat, 08 Jan 2022 23:48:03 +0000 Received: (at 53131) by debbugs.gnu.org; 8 Jan 2022 23:47:59 +0000 Received: from localhost ([127.0.0.1]:48962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LRH-0006V6-7y for submit@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:59 -0500 Received: from mail-qk1-f178.google.com ([209.85.222.178]:37528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n6LR5-0006St-KN for 53131@debbugs.gnu.org; Sat, 08 Jan 2022 18:47:58 -0500 Received: by mail-qk1-f178.google.com with SMTP id t66so10599490qkb.4 for <53131@debbugs.gnu.org>; Sat, 08 Jan 2022 15:47:47 -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=2qrw9ypxSK4all6XHJvjoAE3S+OVwdMw5FUdVm84HTk=; b=Ojb89BYvTpN4ou7LIGN53zQOwjG5zv7LdYkglTEcZtPiPbrftsGkW8JfKOefHrel66 omuS2ZY1LLMZ5XXiYyDPa76K4q/RkKW092RwIyXyroW5QB0bLeyevZ/25bP/mVUlgd46 QUMaOWE4RLYrQP8avZnwLCy3NnwuB3fopY2PO3iS5QjQXcGcXFi94AoMVLW/pryVaigp Ahd+gfUXSAzkbyvZ8r6bKYcHVfv6Sv0izw0buhANcDwyCB1O/xN/7M+l1QFt8vO4mGkx 0WA1PJfEXzxOpuMjPwfNO4t0Lo/V/aRHugpYEjg46Gvi9cZJ+Aadmavyx1BRbmZg75sn sEMg== 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=2qrw9ypxSK4all6XHJvjoAE3S+OVwdMw5FUdVm84HTk=; b=ZJMWPozTL5oR6PABO792TpKmZUM3jS7LREgxzy7j6luyZC4DgDLOV/qvERefC+sLOO qC2VcUoeL32PSNBfsnaT25nDVk7/OtNbnHq04R+I3L6d0JUXZ8MdQlw0KnBMMRZtDW4j bzoXwunW4ZIJ/D8xvcBcQSUL3i8rMJk+HIolxCALg8OvM/1St6coNv97QrV6ZB0uW3LW 1NovsyYF3L2/tm59hc7w9GyTZMfQcPV3mBtvmHPBJIuNqRor32JB4dW/SZQucEN1+HvN Ex9wi7tzwy3gd5yzKONEhSZ+nWE1f8KhadhR8xN1mXQyRYmz9ajSIrrk0fI2SVeKDlce oQrQ== X-Gm-Message-State: AOAM532td5RYik57dGFPM/RlmiypHLdi5Xhi8xlkhH5Gabtm0ytxNd7Y jju9qwdK+aMvMUig5xT8bqrq9Ljes1ScrYex X-Google-Smtp-Source: ABdhPJxFapqujEKrT4sjXBvFHzmXkkUVYOoSEzptwgK9oXGmzs/8HoQdL46TakCYHFC5oca/f9dR/A== X-Received: by 2002:a37:a141:: with SMTP id k62mr49780786qke.344.1641685662097; Sat, 08 Jan 2022 15:47:42 -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 j9sm1807111qkp.111.2022.01.08.15.47.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 08 Jan 2022 15:47:41 -0800 (PST) From: Philip McGrath Date: Sat, 8 Jan 2022 18:47:18 -0500 Message-Id: <20220108234718.150528-4-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220108234718.150528-1-philip@philipmcgrath.com> References: <20220108234449.149435-1-philip@philipmcgrath.com> <20220108234718.150528-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 * gnu/packages/fonts.scm (font-fira-go)[description]: Note lack of corresponding source. --- gnu/packages/fonts.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 41caa4d5ee..b37408f653 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1136,7 +1136,13 @@ (define-public font-fira-go (synopsis "Multilingual extension of the Fira Sans font family") (description "FiraGO is a multilingual extension of the Fira Sans font family. Based on the Fira Sans 4.3 glyph set, FiraGO adds support for the -Arabic, Devanagari, Georgian, Hebrew and Thai scripts.") +Arabic, Devanagari, Georgian, Hebrew and Thai scripts. + +Note that FiraGO does not include corresponding source.") + ;; See: + ;; - https://github.com/bBoxType/FiraGO/issues/42 + ;; - https://github.com/bBoxType/FiraSans/issues/4#issuecomment-699882058 + ;; For further discussion, see comments on font-fira-sans. (license license:silofl1.1))) (define-public font-fira-code