From patchwork Mon Apr 7 14:55:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kurome X-Patchwork-Id: 41404 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 11F7527BC4B; Mon, 7 Apr 2025 15:58:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 6AB4727BC49 for ; Mon, 7 Apr 2025 15:58:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1nvY-0005gb-C6; Mon, 07 Apr 2025 10:58:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u1nvL-0005bV-SA for guix-patches@gnu.org; Mon, 07 Apr 2025 10:58:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u1nvL-0003bY-9q; Mon, 07 Apr 2025 10:58:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=jtI/oqtp5tz4PDmXCIG9W0Zvwz19QimR2gFkopiXwek=; b=qgXrWnGjMf0kya7x7Ajx4ynws4Um/h8HWa3vLxLrg1Tx3QfCstte9VmZemgF2HGfAM23Tq2IiHqKscfjrcWqZoVZE46l/zDdVhd+MUdigIbucg3obeWYftNAwpxXvWElxGD8kBDZzPqv7Q7mRof/eGiGkv5wWq3SYmoUREDY7uZrTPIUh9MgNaL8PpjNGpqxZNia4R0zFzFQrQEHcio9WBO26dKoHccFyeAjaYrimr63OeFu317C57/olQsvN7yCnoMgLQAriBYmf6hImMfvWzb2AjuUgfoOkmXe7KSewis7XqmyO9FkrbPQTNWvlY0FDicxH2y2prhSlVAVjQcfDQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u1nvF-00053m-SJ; Mon, 07 Apr 2025 10:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77601] [PATCH v2 1/2] gnu: font-fira-sans: Update to 4.301-1.f54eeb3 References: <20250407090130.18734-1-hunt31999@gmail.com> In-Reply-To: <20250407090130.18734-1-hunt31999@gmail.com> Resent-From: Kurome Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Mon, 07 Apr 2025 14:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77601 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77601@debbugs.gnu.org Cc: Kurome , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 77601-submit@debbugs.gnu.org id=B77601.174403784219310 (code B ref 77601); Mon, 07 Apr 2025 14:58:01 +0000 Received: (at 77601) by debbugs.gnu.org; 7 Apr 2025 14:57:22 +0000 Received: from localhost ([127.0.0.1]:56233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1nub-00051H-7e for submit@debbugs.gnu.org; Mon, 07 Apr 2025 10:57:21 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:43368) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u1nuZ-00050k-KK for 77601@debbugs.gnu.org; Mon, 07 Apr 2025 10:57:20 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-736c277331eso4039416b3a.1 for <77601@debbugs.gnu.org>; Mon, 07 Apr 2025 07:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744037833; x=1744642633; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jtI/oqtp5tz4PDmXCIG9W0Zvwz19QimR2gFkopiXwek=; b=TkUxidIcbEVgkCBrDlCWWTn+wvH5Dreu/EwNabUEWVVnVlPzIYrDwFKx0u+GQFDlMm aCXYkeJB1NCmHSBQpsQ6iFYK5iE1R6836rIaIX4jJGaajDWa1Vn84rGqunq4O/5FI64D KFzl9H67ZGi5WOa0DOBRSlSqjQSAXW79vh+Xdrr/UrktEHBYWn73G+K9ih/ufmiqbYnu xTe8rVclL7/KM8wFj4E97KiCOljXMCIGrF1UldddE3EkJHwU2WhlABqiNd5qallVLvws TO/ZJrZ9XUl1BWvjYCSxazGLIRR7Tjs/qO5uMH5IaeIQsbArgNppJX4zieUBXx7+6nSx L60Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744037833; x=1744642633; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jtI/oqtp5tz4PDmXCIG9W0Zvwz19QimR2gFkopiXwek=; b=wAyDhOt7H7KVFFSDnixn/S+CCpYSJaFTwbJmgxFn1UGEDkyaXG9i0bwlFySjhU7gsc Rh1V0m1dlDMaMxj+UoeDHGdFScb8NWgmGkDjMicd6bEJHtBwIgvhDNIf6HUsSm+HqATi htSbYRpbhLIOyZBlxUovCIbrey2QozCCOZGUSmP2AdpR64U7h1jAqsYxSA5b9xfwWRQj 9Le4MikSNjart1PbfEU/wqEI3+d29tNwRvwxUnyJA1A+NtGk0+1cBmEumEf57qlHeVuv AUPijtl2EyPObZEqr/Tx9yU7XxH9m2KbqrNoag+IsXJTwVJ+PcVHcFI8jrPVIFQqjnG5 NrlA== X-Gm-Message-State: AOJu0Yx96DPzQZqorkfvSeGx+SdRALeBESy8QLfGrhVnSegg2Q5KCn3c fbX9EfaAuOGjufSShlorBv2LW+xg6s34UkhWwvk/B5pVXjmznb7HzdFnqhmR0/I= X-Gm-Gg: ASbGncur+KhxkL825qsipUWjsebHbPM9KYmUqMoVgaEg+nJXC2m1LNy5oEiHy/Okp/d pl/IXd9JFIMHwQ61vN/G5CZrMOShKNfki8w+BqrZhGa9yX6rT5B7eTOGCikjqUJoPp2HgRjMvs8 pRMpZAxduGGVkSdX7UQHwwMaGcVhzPXq+Hz0p0JVbQ9DcHXyP1psdw+8GNROFEq9v2uJI27j/mk 00P+Jhu99ps2R3xtcj/KaV6FIf59MTHnY4i30pdizE21NBg44dXj/u4UTti9QUfPxfCtmw8vnDB uGB2DvMILhEFm8fBgGQEa0tjfx9WjkjcKx4lM5SAUTuLVlOcD6tBHAtJltpZcA== X-Google-Smtp-Source: AGHT+IFx2FKY0MKCU9U9YCAo/35cukkpeNPbVc/fQ8S43WDU3MSE+9GP7VtAKUQuP575XbXBWfc0Vg== X-Received: by 2002:a05:6a21:318c:b0:1f3:323e:3743 with SMTP id adf61e73a8af0-201050b3a39mr18001033637.12.1744037833008; Mon, 07 Apr 2025 07:57:13 -0700 (PDT) Received: from kuroputer.flets-east.jp ([240b:10:3481:ee00:8906:977f:5873:985e]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-af9bc3fd70csm7409411a12.56.2025.04.07.07.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 07:57:12 -0700 (PDT) From: Kurome Date: Mon, 7 Apr 2025 23:55:56 +0900 Message-ID: <20250407145623.23892-1-hunt31999@gmail.com> X-Mailer: git-send-email 2.49.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The former comment mentioned that this is the final version including the source code. However, many fonts included in Guix do not come with source code, so I believe this is acceptable. * gnu/packages/fonts.scm (font-fira-sans): Update to 4.301-1.f54eeb3. Add revision number. [version]: Use git-version. [arguments]: Use G-Expression. <#:phases>: Modify 'enter-license-directory because the license directory has changed. Change-Id: Ib8e2a4fc194cf1886e0679c0824684700f4e728e --- gnu/packages/fonts.scm | 92 +++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 47 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 75b1bee6e2..33456697cd 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1664,11 +1664,6 @@ (define-public font-microsoft-cascadia (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 @@ -1683,48 +1678,51 @@ (define-public font-fira-sans ;; 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))))) - (add-before 'install-license-files 'enter-license-directory - (lambda _ - (chdir "../OFL_Licence")))))) - ;; 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 + (let ((commit "f54eeb3124c63fe9b5bcd36d09d1cd46788cd15e") + (revision "1")) + (package + (name "font-fira-sans") + (version (git-version "4.301" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/bBoxType/FiraSans") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1081x67dbmm2x4ckq67a8d6ia209x6jp70swl4w9v9nl1ci03jn3")))) + (build-system font-build-system) + (arguments + (list + #: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))))) + (add-before 'install-license-files 'enter-license-directory + (lambda _ + (chdir "..")))))) + ;; 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