From patchwork Tue Nov 16 19:07:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34542 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 1191C27BBE3; Tue, 16 Nov 2021 19:08:12 +0000 (GMT) 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, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, 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 ESMTPS id CC8B727BBE1 for ; Tue, 16 Nov 2021 19:08:11 +0000 (GMT) Received: from localhost ([::1]:41794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn3oQ-0001Xu-Sp for patchwork@mira.cbaines.net; Tue, 16 Nov 2021 14:08:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37386) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn3oI-0001XF-MW for guix-patches@gnu.org; Tue, 16 Nov 2021 14:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47669) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn3oI-00012N-C1 for guix-patches@gnu.org; Tue, 16 Nov 2021 14:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mn3oH-0000YD-VT for guix-patches@gnu.org; Tue, 16 Nov 2021 14:08:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51774] [PATCH v2] gnu: font-adobe-source-code-pro: Update to 2.032R-ro-1.052R-it-1.012R-VAR. References: In-Reply-To: Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Nov 2021 19:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51774 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 51774@debbugs.gnu.org, "jlicht@fsfe.org" Received: via spool by 51774-submit@debbugs.gnu.org id=B51774.16370896722086 (code B ref 51774); Tue, 16 Nov 2021 19:08:01 +0000 Received: (at 51774) by debbugs.gnu.org; 16 Nov 2021 19:07:52 +0000 Received: from localhost ([127.0.0.1]:59215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn3o8-0000Xa-8t for submit@debbugs.gnu.org; Tue, 16 Nov 2021 14:07:52 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:16200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn3o6-0000XG-I8 for 51774@debbugs.gnu.org; Tue, 16 Nov 2021 14:07:51 -0500 Date: Tue, 16 Nov 2021 19:07:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637089659; bh=afc2q8/N0poUoChnQgNc+0qO6yKb1MYGrDDk9Lej2C8=; h=Date:To:From:Cc:Reply-To:Subject:From; b=W8tPR+P71FYGxKANQlC8ZvF0HOyzkRQ57mH/giECHp2MJ23Bl7fY1zwKRdaK4Yp9K jSo15RSeaE3amaDuSWn7kB+nb0Qy5KrT6JftVdBBkPrNUHGyIXgfV/GirrXBHEKFcx GsM/xmfnbRTMOxDXsnOPn+kRJwDlP8onsbHIbg38= Message-ID: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi, Jelle pointed out, that this font is already packaged as adobe-source-code-pro. Thanks, indeed it is. Unfortunately since the version string changed (another backslash) the regexp now looks horrible. Maybe it would be better to define it with let to keep the code cleaner. What do you think? Petr * gnu/packages/fonts (font-adobe-source-code-pro): Update to 2.032R-ro-1.052R-it-1.012R-VAR and update regexp in commit. --- 2.33.0 diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f36a71bdd..eddbeaba7e 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -975,19 +975,20 @@ (define-public font-hack (define-public font-adobe-source-code-pro (package (name "font-adobe-source-code-pro") - (version "2.030R-ro-1.050R-it") + (version "2.032R-ro-1.052R-it-1.012R-VAR") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/adobe-fonts/source-code-pro") - (commit (regexp-substitute/global - ;; The upstream tag uses "/" between the roman and italic - ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post)))) + (commit (regexp-substitute/global #f "it-" (regexp-substitute/global + ;; The upstream tag uses "/" between the roman and italic + ;; versions, so substitute our "-" separator here. + #f "R-ro-" version 'pre "R-ro/" 'post) 'pre "it/" + 'post)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n")))) + (base32 "1lqchm8z0ah5y675ycmciqvr8y1v1gcj22ysfs443gm291vy0z4v")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-code-pro") (synopsis