From patchwork Fri Feb 3 12:42:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46642 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 712AE27BBED; Fri, 3 Feb 2023 12:45:08 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 C445927BBE9 for ; Fri, 3 Feb 2023 12:45:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQI-0005l2-DB; Fri, 03 Feb 2023 07:44:10 -0500 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 1pNvQB-0005cz-Bw for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQA-0004Xk-R2 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQA-0004Jv-8p for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 01/19] build-system/font: Add #:license-file-regexp argument. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542820616336 (code B ref 61253); Fri, 03 Feb 2023 12:44:02 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:26 +0000 Received: from localhost ([127.0.0.1]:36694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPZ-0004FO-Qh for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:26 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPY-0004EY-Cm for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:24 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2DCB5684FF for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H5x4F-yT-hZA for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:18 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E399C68253 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:18 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:42:58 -0500 Message-Id: <045f4cd33542a6540a70cc1218b4f5bfab10b492.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * guix/build-system/font.scm (font-build): Add #:license-file-regexp argument and honour it. * guix/build/font-build-system.scm (%license-file-regexp): New variable, duplicated from (gnu build gnu-build-system). --- guix/build-system/font.scm | 2 ++ guix/build/font-build-system.scm | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index c43fb9a542..45933b138f 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -77,6 +77,7 @@ (define* (font-build name inputs (tests? #t) (test-target "test") (configure-flags ''()) + (license-file-regexp '%license-file-regexp) (phases '%standard-phases) (outputs '("out")) (search-paths '()) @@ -98,6 +99,7 @@ (define builder #:system #$system #:test-target #$test-target #:tests? #$tests? + #:license-file-regexp #$license-file-regexp #:phases #$(if (pair? phases) (sexp->gexp phases) phases) diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm index e4784bc17d..8418ada1d2 100644 --- a/guix/build/font-build-system.scm +++ b/guix/build/font-build-system.scm @@ -23,6 +23,7 @@ (define-module (guix build font-build-system) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases + %license-file-regexp font-build)) ;; Commentary: @@ -56,6 +57,10 @@ (define* (install #:key outputs #:allow-other-keys) (for-each (cut install-file <> (string-append fonts "/web")) (find-files source "\\.(woff|woff2)$")))) +(define %license-file-regexp + ;; Regexp matching license files. + "^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$") + (define %standard-phases (modify-phases gnu:%standard-phases (replace 'unpack unpack) From patchwork Fri Feb 3 12:42:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46639 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 7AA3C27BBF0; Fri, 3 Feb 2023 12:44:58 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 D004727BBE9 for ; Fri, 3 Feb 2023 12:44:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQG-0005gy-Rr; Fri, 03 Feb 2023 07:44:09 -0500 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 1pNvQB-0005e5-AG for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQB-0004Xl-1i for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQA-0004K3-K4 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 02/19] build-system/font: Customize %license-file-regexp. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542820616342 (code B ref 61253); Fri, 03 Feb 2023 12:44:02 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:26 +0000 Received: from localhost ([127.0.0.1]:36696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPa-0004FR-6x for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:26 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPY-0004EZ-F0 for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:24 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 40EF46846C for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LpvHa0q_KXrK for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 0434D6830E for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:18 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:42:59 -0500 Message-Id: X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * guix/build/font-build-system.scm (%license-file-regexp): Customize to include names of license files commonly found in font packages. --- guix/build/font-build-system.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm index 8418ada1d2..0b1542394a 100644 --- a/guix/build/font-build-system.scm +++ b/guix/build/font-build-system.scm @@ -58,8 +58,9 @@ (define* (install #:key outputs #:allow-other-keys) (find-files source "\\.(woff|woff2)$")))) (define %license-file-regexp - ;; Regexp matching license files. - "^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$") + ;; Regexp matching license files commonly found in font packages. + "^((COPY(ING|RIGHT)|LICEN[CS]E).*\ +|(([Cc]opy[Rr]ight|[Ll]icen[cs]es?|IPA_.*|OFL(-?1\\.?1)?)(\\.(txt|md)?))$)") (define %standard-phases (modify-phases gnu:%standard-phases From patchwork Fri Feb 3 12:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46635 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 353E927BBEB; Fri, 3 Feb 2023 12:44:47 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 D9F6F27BBED for ; Fri, 3 Feb 2023 12:44:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQK-0005mi-BU; Fri, 03 Feb 2023 07:44:12 -0500 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 1pNvQB-0005eP-DF for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQB-0004Xt-5A for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQB-0004KA-10 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 03/19] gnu: font-canada1500: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542820916359 (code B ref 61253); Fri, 03 Feb 2023 12:44:02 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:29 +0000 Received: from localhost ([127.0.0.1]:36698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPc-0004Fj-Jl for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:28 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44076) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPY-0004Ea-L2 for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:25 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 73227684F4 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C3QV6ZBDmhXt for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 1CED36847F for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:00 -0500 Message-Id: <17aad2680121f30317a87b139fb8ade756a7de8c.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-canada1500)[source]: Use url-fetch/zipbomb. [arguments]: Add with #:license-file-regexp. --- gnu/packages/fonts.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6d1fc14f37..452e0a0126 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -220,12 +220,14 @@ (define-public font-canada1500 (name "font-canada1500") (version "1.101") (source (origin - (method url-fetch) + (method url-fetch/zipbomb) (uri "https://typodermicfonts.com/wp-content/uploads/2017/06/canada1500.zip") (sha256 (base32 "0cdcb89ab6q7b6jd898bnvrd1sifbd2xr42qgji98h8d5cq4b6fp")))) (build-system font-build-system) + (arguments + '(#:license-file-regexp "^license.pdf$")) (home-page "https://typodermicfonts.com/canada1500/") (synopsis "Canadian typeface that supports English, French and Aboriginal languages") (description "Canada1500 is a display typeface originally created for the From patchwork Fri Feb 3 12:43:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46651 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 435BC27BBEB; Fri, 3 Feb 2023 12:45:53 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 6FC2C27BBE9 for ; Fri, 3 Feb 2023 12:45:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQI-0005kV-3K; Fri, 03 Feb 2023 07:44:10 -0500 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 1pNvQB-0005fc-QI for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQB-0004Y3-HW for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQB-0004KH-Cp for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 04/19] gnu: font-lato: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542820916366 (code B ref 61253); Fri, 03 Feb 2023 12:44:03 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:29 +0000 Received: from localhost ([127.0.0.1]:36700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPc-0004Fq-Uk for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:29 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPY-0004Ec-Sj for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:25 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id AC43C68500 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ApZEts_PJCA7 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 33C2D68253 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:01 -0500 Message-Id: X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-lato)[source]: Use url-fetch. --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 452e0a0126..5e6e25db43 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -274,7 +274,7 @@ (define-public font-lato (name "font-lato") (version "2.015") ; also update description (source (origin - (method url-fetch/zipbomb) + (method url-fetch) (uri (string-append "https://www.latofonts.com/download/Lato2OFL.zip")) (sha256 (base32 From patchwork Fri Feb 3 12:43:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46643 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 DAE7527BBF0; Fri, 3 Feb 2023 12:45: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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 2746C27BBE9 for ; Fri, 3 Feb 2023 12:45:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQO-0005qc-Ex; Fri, 03 Feb 2023 07:44:16 -0500 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 1pNvQC-0005gK-8b for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQB-0004YB-Vj for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQB-0004KP-R4 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 05/19] gnu: font-linuxlibertine: Install all license files. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542820916372 (code B ref 61253); Fri, 03 Feb 2023 12:44:03 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:29 +0000 Received: from localhost ([127.0.0.1]:36702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPd-0004Fv-77 for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:29 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPY-0004Eb-Qf for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:25 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 9D97C68502 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 38qSdKW2B4wu for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 554836830E for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:02 -0500 Message-Id: X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-linuxlibertine)[arguments] <#:license-file-regexp>: Add. --- gnu/packages/fonts.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5e6e25db43..44038fc0eb 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -425,7 +425,8 @@ (define-public font-linuxlibertine "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v")))) (build-system font-build-system) (arguments - `(#:phases + `(#:license-file-regexp "^(GPL|LICENCE|OFL-1\\.1)\\.txt$" + #:phases (modify-phases %standard-phases (add-before 'install 'build (lambda _ From patchwork Fri Feb 3 12:43:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46634 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 8D0D827BBF0; Fri, 3 Feb 2023 12:44:45 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D6EC227BBEB for ; Fri, 3 Feb 2023 12:44:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQN-0005qL-En; Fri, 03 Feb 2023 07:44:15 -0500 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 1pNvQF-0005i9-1i for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQE-0004Z1-Pt for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQE-0004LE-Le for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 06/19] gnu: font-wqy-zenhei: Install all license files. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821616518 (code B ref 61253); Fri, 03 Feb 2023 12:44:06 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:36 +0000 Received: from localhost ([127.0.0.1]:36730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPk-0004IG-CN for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:36 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004FH-P4 for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:32 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 65FBC6850B for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gysTGxfr-drr for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:23 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 8329D6847F for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:03 -0500 Message-Id: <4a9cebd4c0fb292a41298dc59f9480dfdea0ec07.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-wqy-zenhei)[arguments]: Add with #:license-file-regexp. --- gnu/packages/fonts.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 44038fc0eb..bdc673edfd 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -652,6 +652,8 @@ (define-public font-wqy-zenhei (base32 "1mkmxq8g2hjcglb3zajfqj20r4r88l78ymsp2xyl5yav8w3f7dz4")))) (build-system font-build-system) + (arguments + '(#:license-file-regexp "^(COPYING|README)$")) (home-page "http://wenq.org/wqy2/") (synopsis "CJK font") (description From patchwork Fri Feb 3 12:43:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46645 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 9C89527BBED; Fri, 3 Feb 2023 12:45:18 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 18B7627BBE9 for ; Fri, 3 Feb 2023 12:45:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQO-0005qX-Fl; Fri, 03 Feb 2023 07:44:16 -0500 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 1pNvQE-0005i1-7C for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQD-0004Yn-Uk for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQD-0004Kz-Q2 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 07/19] gnu: font-wqy-microhei: Install all license files. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821616504 (code B ref 61253); Fri, 03 Feb 2023 12:44:05 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:36 +0000 Received: from localhost ([127.0.0.1]:36726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPj-0004Hv-OF for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:36 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004Eq-15 for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:31 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 0065168505 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CQUXJVXdokS5 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id A439E6830E for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:04 -0500 Message-Id: <54ff170a60ad0b1680457fadb645dc08508bcb01.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-wqy-microhei)[arguments]: Add with #:license-file-regexp. --- gnu/packages/fonts.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index bdc673edfd..4700bbcb43 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -681,6 +681,8 @@ (define-public font-wqy-microhei (base32 "0gi1yxqph8xx869ichpzzxvx6y50wda5hi77lrpacdma4f0aq0i8")))) (build-system font-build-system) + (arguments + '(#:license-file-regexp "^(LICENSE.*|README)\\.txt$")) (home-page "http://wenq.org/wqy2/") (synopsis "CJK font") (description From patchwork Fri Feb 3 12:43:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46644 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 F3F4127BBE9; Fri, 3 Feb 2023 12:45:14 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 5E3AE27BBED for ; Fri, 3 Feb 2023 12:45:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQL-0005mm-9d; Fri, 03 Feb 2023 07:44:13 -0500 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 1pNvQC-0005hy-Vm for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQC-0004YM-NN for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQC-0004Kd-J2 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 08/19] gnu: font-fira-sans: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821516475 (code B ref 61253); Fri, 03 Feb 2023 12:44:04 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:35 +0000 Received: from localhost ([127.0.0.1]:36719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPi-0004HZ-Sb for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:35 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004Ep-0m for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:30 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 3ADF168507 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XCpkOyrdW6k9 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C65B668253 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:05 -0500 Message-Id: <4acc7f7bc10388be5b3c3a158a2a741d09865a70.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-fira-sans)[arguments]<#:phases>: Add "enter-license-directory" phase. --- gnu/packages/fonts.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 4700bbcb43..f5d26c7b19 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1301,7 +1301,10 @@ (define variant (match (find-files "." (format #f "^Fira_~a_[0-9]" variant) #:directories? #t) ((dir) - (chdir 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/") From patchwork Fri Feb 3 12:43:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46637 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 A3C5727BBE9; Fri, 3 Feb 2023 12:44:52 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 136D227BBEB for ; Fri, 3 Feb 2023 12:44:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQJ-0005lW-5J; Fri, 03 Feb 2023 07:44:11 -0500 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 1pNvQF-0005iM-D6 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQF-0004Z6-5C for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQF-0004LM-0r for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 09/19] gnu: font-fira-go: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821716527 (code B ref 61253); Fri, 03 Feb 2023 12:44:06 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:37 +0000 Received: from localhost ([127.0.0.1]:36732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPk-0004IN-LB for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:36 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004FI-On for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:32 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 7DBEB684FF for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bYca45KBNufE for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:25 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id DF18B68503 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:06 -0500 Message-Id: X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-fira-go)[arguments]: Add with "enter-license-directory" phase. --- gnu/packages/fonts.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f5d26c7b19..469a80e599 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1344,6 +1344,13 @@ (define-public font-fira-go (base32 "10rcfg1fijv00yxv5n9l3lm0axhafa1irkg42zpmasd70flgg655")))) (build-system font-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'install-license-files 'enter-license-directory + (lambda _ + (chdir "OFL_Licence")))))) (home-page "https://github.com/bBoxType/FiraGO") (synopsis "Multilingual extension of the Fira Sans font family") (description "FiraGO is a multilingual extension of the Fira Sans font From patchwork Fri Feb 3 12:43:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46646 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 9EC4E27BBE9; Fri, 3 Feb 2023 12:45:21 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 392CF27BBEB for ; Fri, 3 Feb 2023 12:45:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQM-0005p4-FA; Fri, 03 Feb 2023 07:44:14 -0500 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 1pNvQE-0005i2-Lm for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQE-0004Yw-De for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQE-0004L7-8Z for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 10/19] gnu: font-comic-neue: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821616511 (code B ref 61253); Fri, 03 Feb 2023 12:44:06 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:36 +0000 Received: from localhost ([127.0.0.1]:36728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPk-0004I9-3o for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:36 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44236) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004Et-1M for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:31 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 632AB68509 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8WuzoqEjO9Dy for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 042C568506 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:07 -0500 Message-Id: <878b9f51357dd0862d1de3b71acbc736d093248c.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-comic-neue)[arguments]<#:phases>: Add "enter-license-directory" phase. --- gnu/packages/fonts.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 469a80e599..ecbce39e68 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1524,7 +1524,10 @@ (define-public font-comic-neue \n")))) - #t))))) + #t)) + (add-before 'install-license-files 'enter-license-directory + (lambda _ + (chdir (string-append "comic-neue-" ,version))))))) (home-page "http://www.comicneue.com/") (synopsis "Font that fixes the shortcomings of Comic Sans") (description From patchwork Fri Feb 3 12:43:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46640 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 2717F27BBED; Fri, 3 Feb 2023 12:45:00 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 2F43527BBEE for ; Fri, 3 Feb 2023 12:44:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQJ-0005lF-4P; Fri, 03 Feb 2023 07:44:11 -0500 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 1pNvQG-0005jq-Ks for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQG-0004ZL-Bb for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQG-0004Li-74 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 11/19] gnu: font-space-grotesk: Remove obsolete phase. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821816550 (code B ref 61253); Fri, 03 Feb 2023 12:44:08 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:38 +0000 Received: from localhost ([127.0.0.1]:36738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPl-0004Il-S4 for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:38 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004FM-Q9 for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:33 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 852146846C for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nc4fQu2GWnXE for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:25 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 25A2A6830E for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:08 -0500 Message-Id: <3190e26dfcea033de0b359b226f6822390d7c108.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-space-grotesk)[arguments]: Remove along with obsolete "install-license-files" phase. --- gnu/packages/fonts.scm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index ecbce39e68..29c26fa6b3 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1757,15 +1757,6 @@ (define-public font-space-grotesk (base32 "1aiivn0rl7ydiyqvsr0fa2hx82h3br3x48w3100fcly23n0fdcby")))) (build-system font-build-system) ;; TODO: Package fontmake and gftools and build from source. - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'install-license-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) - (install-file "OFL.txt" doc) - #t)))))) (home-page "https://floriankarsten.github.io/space-grotesk/") (synopsis "Proportional variant of the fixed-width Space Mono family") (description From patchwork Fri Feb 3 12:43:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46641 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 DC9EE27BBEB; Fri, 3 Feb 2023 12:45:05 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 AE64527BBE9 for ; Fri, 3 Feb 2023 12:45:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQI-0005kM-0k; Fri, 03 Feb 2023 07:44:10 -0500 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 1pNvQC-0005hs-TG for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQC-0004YK-B3 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQC-0004KW-79 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 12/19] gnu: font-go: Install license files. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821416468 (code B ref 61253); Fri, 03 Feb 2023 12:44:04 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:34 +0000 Received: from localhost ([127.0.0.1]:36717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPi-0004HX-JW for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:34 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004Er-15 for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:30 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 9E7C36850C for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0F6BS5FP1q5c for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 3CDC868508 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:09 -0500 Message-Id: <9bfd9fc244ba3ad5e7b413aa58aa23d04714a52c.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-go)[arguments]<#:license-file-regexp>: Add. <#:phases>: Add "enter-license-directory" phase. --- gnu/packages/fonts.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 29c26fa6b3..0d373c7393 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1787,12 +1787,16 @@ (define-public font-go "1aq6mnjayks55gd9ahavk6jfydlq5lm4xm0xk4pd5sqa74p5p74d")))) (build-system font-build-system) (arguments - `(#:phases + `(#:license-file-regexp "^(LICENSE|PATENTS)$" + #:phases (modify-phases %standard-phases (add-before 'install 'chdir (lambda _ (chdir "font/gofont/ttfs") - #t))))) + #t)) + (add-before 'install-license-files 'enter-license-directory + (lambda _ + (chdir "../../..")))))) (home-page "https://blog.golang.org/go-fonts") (synopsis "The Go font family") (description From patchwork Fri Feb 3 12:43:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46636 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 3DB5E27BBEE; Fri, 3 Feb 2023 12:44:52 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A7FD627BBE9 for ; Fri, 3 Feb 2023 12:44:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQK-0005mb-7z; Fri, 03 Feb 2023 07:44:12 -0500 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 1pNvQH-0005kL-E0 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQH-0004Zo-3f for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQG-0004Lw-W3 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 13/19] gnu: font-dosis: Remove extraneous files; install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821916563 (code B ref 61253); Fri, 03 Feb 2023 12:44:08 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:39 +0000 Received: from localhost ([127.0.0.1]:36742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPm-0004J3-HH for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:38 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004F4-Gf for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:34 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 132BB6850F for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YAqQ7ULLzkbf for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 5577068253 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:10 -0500 Message-Id: <1a86f1535f50f82eff678fda8d677295d0cfadd9.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-dosis)[source]: Use url-fetch. --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 0d373c7393..83f658743c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1887,7 +1887,7 @@ (define-public font-dosis (version "1.7") (source (origin - (method url-fetch/zipbomb) + (method url-fetch) (uri (string-append "https://web.archive.org/web/20180228233737/" "https://www.impallari.com/media/releases/dosis-" "v" version ".zip")) From patchwork Fri Feb 3 12:43:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46647 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 46C9627BBEB; Fri, 3 Feb 2023 12:45:38 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 10A5927BBE9 for ; Fri, 3 Feb 2023 12:45:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQM-0005oZ-DS; Fri, 03 Feb 2023 07:44:14 -0500 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 1pNvQD-0005i0-Pu for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQD-0004Yg-Gv for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQD-0004Ks-CZ for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 14/19] gnu: font-culmus: Install all license files. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821516491 (code B ref 61253); Fri, 03 Feb 2023 12:44:05 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:35 +0000 Received: from localhost ([127.0.0.1]:36723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPj-0004Hn-FQ for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:35 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004Er-Fy for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:31 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 60ED86830E for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KxhXMdJu2rIH for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:27 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 73C7E68501 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:11 -0500 Message-Id: <7b27686fe1328ac2d659d00adca82f7a70903ee9.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-culmus)[arguments]<#:license-file-regexp>: Add. --- gnu/packages/fonts.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 83f658743c..3e9bd193fc 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1921,7 +1921,8 @@ (define-public font-culmus "02akysgsqhi15cck54xcacm16q5raf4l7shgb8fnj7xr3c1pbfyp")))) (build-system font-build-system) (arguments - `(#:phases + `(#:license-file-regexp "^GNU-GPL|LICENSE" + #:phases (modify-phases %standard-phases (add-before 'install 'build (lambda _ From patchwork Fri Feb 3 12:43:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46638 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 92B7327BBED; Fri, 3 Feb 2023 12:44:54 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 E031627BBE9 for ; Fri, 3 Feb 2023 12:44:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQJ-0005lY-6w; Fri, 03 Feb 2023 07:44:11 -0500 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 1pNvQG-0005iO-80 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQF-0004ZG-W7 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQF-0004La-S5 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 15/19] gnu: font-dseg: Simplify "install" phase. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821716542 (code B ref 61253); Fri, 03 Feb 2023 12:44:07 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:37 +0000 Received: from localhost ([127.0.0.1]:36736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPl-0004Ie-Fl for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:37 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004FF-OA for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:32 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 39E5168506 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:22 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RJiqL91Itojo for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 952E66850B for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:12 -0500 Message-Id: <037c0b4bd82e3590131d4f344fb75161719ea694.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-dseg)[source]: Use url-fetch. [arguments]<#:phases>: Remove "with-directory-excursion" from "install" phase. --- gnu/packages/fonts.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3e9bd193fc..335ce9885f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2176,7 +2176,7 @@ (define-public font-dseg (version "0.46") (source (origin - (method url-fetch/zipbomb) + (method url-fetch) (uri (string-append "https://github.com/keshikan/DSEG/" "releases/download/v" version @@ -2194,13 +2194,9 @@ (define-public font-dseg (let* ((out (assoc-ref outputs "out")) (font-dir (string-append out "/share/fonts")) (truetype-dir (string-append font-dir "/truetype"))) - (with-directory-excursion - (string-append "fonts-DSEG_v" - (apply string-append (string-split ,version - #\.))) - (for-each (lambda (f) (install-file f truetype-dir)) - (find-files "." "\\.ttf$")) - #t))))))) + (for-each (lambda (f) (install-file f truetype-dir)) + (find-files "." "\\.ttf$")) + #t)))))) (home-page "https://www.keshikan.net/fonts-e.html") (synopsis "DSEG: 7-segment and 14-segment fonts") (description From patchwork Fri Feb 3 12:43:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46649 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 16E6327BBED; Fri, 3 Feb 2023 12:45:39 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 888B227BBE9 for ; Fri, 3 Feb 2023 12:45:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQL-0005mn-9o; Fri, 03 Feb 2023 07:44:13 -0500 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 1pNvQI-0005l4-GN for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQH-0004a1-Fx for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQH-0004M4-C8 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 16/19] gnu: font-dseg: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542822416575 (code B ref 61253); Fri, 03 Feb 2023 12:44:09 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:44 +0000 Received: from localhost ([127.0.0.1]:36744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPr-0004JH-U9 for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:44 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPj-0004GF-IH for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:35 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id D1F60684F4 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yjnEd4uJpXEg for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:29 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id ADCCA68504 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:13 -0500 Message-Id: <0e5b5baed731bd20a8eb1a4ea8a1fc7964d898c1.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-dseg)[arguments]<#:license-file-regexp>: Add. --- gnu/packages/fonts.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 335ce9885f..d15ac08def 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2187,7 +2187,8 @@ (define-public font-dseg (base32 "13133kpa1ndsji9yq5ppkds5yq2y094qvrv2f83ah74p40sz9hm6")))) (build-system font-build-system) (arguments - `(#:phases + `(#:license-file-regexp "^DSEG-LICENSE.txt$" + #:phases (modify-phases %standard-phases (replace 'install (lambda* (#:key outputs #:allow-other-keys) From patchwork Fri Feb 3 12:43:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46648 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 B4BC227BBEB; Fri, 3 Feb 2023 12:45:40 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 2BE6027BBEE for ; Fri, 3 Feb 2023 12:45:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQO-0005qz-Oc; Fri, 03 Feb 2023 07:44:16 -0500 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 1pNvQF-0005iN-RO for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQF-0004ZB-Jr for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQF-0004LT-FF for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 17/19] gnu: font-jetbrains-mono: Remove obsolete phase. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821716535 (code B ref 61253); Fri, 03 Feb 2023 12:44:07 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:37 +0000 Received: from localhost ([127.0.0.1]:36734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPk-0004IW-V1 for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:37 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004Ep-Ka for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:33 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 1391868500 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xoST02MZA_63 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:29 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id CE6486850D for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:14 -0500 Message-Id: <676344aaa71ca413fea6b3b3bf9df5214876de13.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-jetbrains-mono)[arguments]<#:phases>: Remove obsolete "install-license-files" phase. --- gnu/packages/fonts.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index d15ac08def..f2c602e70f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2248,13 +2248,7 @@ (define-public font-jetbrains-mono ;; Find the license file outside of the default subdirectory. (lambda _ (chdir "..") - #t)) - (replace 'install-license-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) - (install-file "OFL.txt" doc) - #t)))))) + #t))))) (home-page "https://www.jetbrains.com/lp/mono/") (synopsis "Mono typeface for developers") (description From patchwork Fri Feb 3 12:43:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46650 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 19DB327BBE9; Fri, 3 Feb 2023 12:45:44 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 56E3127BBEB for ; Fri, 3 Feb 2023 12:45:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQM-0005or-CM; Fri, 03 Feb 2023 07:44:14 -0500 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 1pNvQH-0005kJ-CL for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQG-0004Zc-O1 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQG-0004Lp-Is for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 18/19] gnu: font-fontna-yasashisa-antique: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821816556 (code B ref 61253); Fri, 03 Feb 2023 12:44:08 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:38 +0000 Received: from localhost ([127.0.0.1]:36740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPm-0004It-6u for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:38 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPf-0004F3-I0 for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:33 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 6A13F68253 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cO_9DRAAwnxe for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:31 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E79816850E for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:20 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:15 -0500 Message-Id: X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-fontna-yasashisa-antique)[arguments]<#:phases>: Add "enter-license-directory" phase. --- gnu/packages/fonts.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f2c602e70f..b4c6729c2c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2487,7 +2487,10 @@ (define-public font-fontna-yasashisa-antique ;; which makes rename-file fail. Instead, use shell globbing to ;; select and rename the directory. (invoke "sh" "-c" "mv TrueType* TrueType") - #t))))) + #t)) + (add-before 'install-license-files 'enter-license-directory + (lambda _ + (chdir "IPAexfont00201")))))) (native-inputs `(("bash" ,bash-minimal) ("coreutils" ,coreutils))) From patchwork Fri Feb 3 12:43:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46633 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 0825C27BBE9; Fri, 3 Feb 2023 12:44:36 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 4601F27BBEB for ; Fri, 3 Feb 2023 12:44:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQK-0005ml-Qr; Fri, 03 Feb 2023 07:44:13 -0500 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 1pNvQD-0005hz-D0 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQD-0004YY-4j for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQD-0004Kl-0S for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 19/19] gnu: font-charter: Install license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542821516482 (code B ref 61253); Fri, 03 Feb 2023 12:44:04 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:35 +0000 Received: from localhost ([127.0.0.1]:36721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPj-0004Hg-6l for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:35 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44248) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPe-0004F3-GC for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:31 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 47CD768253 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xgxlgSXZRYld for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:21 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 0DC3068510 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:21 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:43:16 -0500 Message-Id: <3866ecc4c83bffa98d90a6df3baa1ad53f048a5e.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * gnu/packages/fonts.scm (font-charter)[arguments]<#:license-file-regexp>: Add. --- gnu/packages/fonts.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index b4c6729c2c..e877b277ea 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2722,7 +2722,8 @@ (define-public font-charter (outputs '("out" "woff2")) (build-system font-build-system) (arguments - `(#:phases + `(#:license-file-regexp "^Charter license.txt$" + #:phases (modify-phases %standard-phases (add-after 'install 'install-woff2 (lambda* (#:key outputs #:allow-other-keys)