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