From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oZweFLUA3WNGFwEAbAwnHQ (envelope-from ) for ; Fri, 03 Feb 2023 13:40:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6AT2ErUA3WMfUgAAauVa8A (envelope-from ) for ; Fri, 03 Feb 2023 13:40:21 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C47FE36DCB for ; Fri, 3 Feb 2023 13:40:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvMU-0003mh-Im; Fri, 03 Feb 2023 07:40: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 1pNvMJ-0003kV-09 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:40:06 -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 1pNvMI-0003pJ-CR for guix-patches@gnu.org; Fri, 03 Feb 2023 07:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvMH-00049O-UK for guix-patches@gnu.org; Fri, 03 Feb 2023 07:40:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 00/19] Add license files missing from font packages Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167542794315878 (code B ref -1); Fri, 03 Feb 2023 12:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Feb 2023 12:39:03 +0000 Received: from localhost ([127.0.0.1]:36685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvLL-000482-0P for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:39:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:46980) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvLJ-00047f-Cn for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:39:02 -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 1pNvLI-0003d4-Mh for guix-patches@gnu.org; Fri, 03 Feb 2023 07:39:00 -0500 Received: from mailout.easymail.ca ([64.68.200.34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pNvLG-0003a4-Nr for guix-patches@gnu.org; Fri, 03 Feb 2023 07:39:00 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id E82B1683E2 for ; Fri, 3 Feb 2023 12:38:56 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yd5J-_zl-7YA for ; Fri, 3 Feb 2023 12:38:55 +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 DD13B6835F for ; Fri, 3 Feb 2023 12:38:54 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:38:52 -0500 Message-Id: X-Mailer: git-send-email 2.38.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@simonsouth.net; helo=mailout.easymail.ca X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675428021; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7qJkw6kRuLcb9+v3sbwpSfw/pbUlVTxrI/svDTbpwWU=; b=HWd+cNn4hqwLjXL/yb03WgwG4KzgdDL61KHXbVxmrP63xLub3ShHyPDMCi6IwGqlgE/le/ /ldW3XTGDPuxhIfQ2PaUqbshBdfac9VoN1Bf3eUzyikToVA8eOgxI91MlQ7Yg1WBS02Zs0 ts4o8uET9kfK7otHvjW3avypoUwDGhZvI0RddSxCguvHEIVhpNp5QUxvU1Y5KLXMDZm86k soEuuuvW3grKV6wKkk7pj8YbysMEES9A4X+2Kmc1a7wlbvTyOpOja4mJ9rtFh8Uhhx/p5r odCIUZK+eOp6HRAx4tzyqTIRSVkN/wGoOqiJUdSyIY5Ji9oFfKNZKb6s1Uxedg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1675428021; a=rsa-sha256; cv=none; b=teaNttONuBZsh6sCLKVmJmBheXI+4RgIvNf20NJ8vt1wUOO4fa9aRLmH3R5C7JftdAgWPn AslfNcUizmtkQdwt53HCDFlJ/sIEGHmEn0V8Lmq36HkJ2BrQm8W+ZZR0UMVuO5jvnG4At7 abG82URDaXdP5H9JgLI6/r1dLofdWYDXAX3/FVkU0VG6z8uKGZiwcAzDXZD7qeuvsBmaHq 5VYtlEdoif+jDgIVmVTOLCU6EsN6VizI+QU8gd2a9YJ9DTMoOUnB3Ef3aAzpXnC2nVZBsY DPK/Pz2LYBX+ekdckaoUh90bk7zeRG/aSvf15Dlpa1IDIURtdLLXu3bpmaHrpQ== X-Migadu-Spam-Score: -1.97 X-Spam-Score: -1.97 X-Migadu-Queue-Id: C47FE36DCB Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Scanner: scn1.migadu.com X-TUID: k/iSNb++DrR9 This patch series adds license files missing from 29 font packages[0] that use font-build-system. It also modifies font-build-system to expose the #:license-file-regexp argument it inherits and provide a custom, more specific default value for it, both of which should help future font-package authors ensure license files are installed correctly. For testing, note you may need to first apply the patches attached to issues 61039, 61119 and 61120[1] to avoid unrelated build failures. In preparing this current set of patches I considered a license file "missing" if it is the only relevant file in the source package, is referred to by another license file or qualifies the license in some way (for instance, a README file specifying an exception to the GPL). In cases where I've changed a package source's fetch method (such as from "url-fetch/zipbomb" to "url-fetch") this was done to ensure the correct working directory is selected when the install-license-files build phase runs, and is related to the unpack phase's magical behaviour of choosing an arbitrary subdirectory to enter before it completes[2]. I've tested these changes on x86-64 and AArch64 and everything seems fine. -- Simon South simon@simonsouth.net [0] font-anonymous-pro, font-anonymous-pro-minus, font-artifika, font-bitstream-vera, font-canada1500, font-catamaran, font-charter, font-comic-neue, font-cormorant, font-culmus, font-dosis, font-dseg, font-fira-go, font-fira-mono, font-fira-sans, font-fontna-yasashisa-antique, font-gfs-ambrosia, font-go, font-ipa-mj-mincho, font-lato, font-libertinus, font-linuxlibertine, font-lohit, font-montserrat, font-sil-andika, font-sil-charis, font-sil-gentium, font-wqy-microhei and font-wqy-zenhei. [1] https://issues.guix.gnu.org/61039 https://issues.guix.gnu.org/61119 https://issues.guix.gnu.org/61120 [2] https://git.savannah.gnu.org/cgit/guix.git/tree/guix/build/gnu-build-system.scm?h=core-updates&id=70b7d19ecf35ec27b169ea1ccc772d4a9ff7df93#n179 Simon South (19): build-system/font: Add #:license-file-regexp argument. build-system/font: Customize %license-file-regexp. gnu: font-canada1500: Install license file. gnu: font-lato: Install license file. gnu: font-linuxlibertine: Install all license files. gnu: font-wqy-zenhei: Install all license files. gnu: font-wqy-microhei: Install all license files. gnu: font-fira-sans: Install license file. gnu: font-fira-go: Install license file. gnu: font-comic-neue: Install license file. gnu: font-space-grotesk: Remove obsolete phase. gnu: font-go: Install license files. gnu: font-dosis: Remove extraneous files; install license file. gnu: font-culmus: Install all license files. gnu: font-dseg: Simplify "install" phase. gnu: font-dseg: Install license file. gnu: font-jetbrains-mono: Remove obsolete phase. gnu: font-fontna-yasashisa-antique: Install license file. gnu: font-charter: Install license file. gnu/packages/fonts.scm | 83 ++++++++++++++++++-------------- guix/build-system/font.scm | 2 + guix/build/font-build-system.scm | 6 +++ 3 files changed, 55 insertions(+), 36 deletions(-) base-commit: 70b7d19ecf35ec27b169ea1ccc772d4a9ff7df93 prerequisite-patch-id: 418e6f2f834e0f77d4da64e48bf654d610fbfe80 prerequisite-patch-id: 7c9321685c0c33cb9d1438797d2cb2bb540276c4 prerequisite-patch-id: 2920d2816c4bcf6e7774b35efd49990aef2d76c9 -- 2.39.1