From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oOvfL+8b3GNoBQAAbAwnHQ (envelope-from ) for ; Thu, 02 Feb 2023 21:24:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OPbnL+8b3GNIGQEAauVa8A (envelope-from ) for ; Thu, 02 Feb 2023 21:24:15 +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 3E2D81E61E for ; Thu, 2 Feb 2023 21:24:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNg7p-0007RS-Pc; Thu, 02 Feb 2023 15:24:06 -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 1pNg7n-0007RC-9r for guix-patches@gnu.org; Thu, 02 Feb 2023 15:24: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 1pNg7m-0005gK-Gp for guix-patches@gnu.org; Thu, 02 Feb 2023 15:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNg7m-0001t3-48 for guix-patches@gnu.org; Thu, 02 Feb 2023 15:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61237] [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Feb 2023 20:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61237 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61237@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16753694217223 (code B ref -1); Thu, 02 Feb 2023 20:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Feb 2023 20:23:41 +0000 Received: from localhost ([127.0.0.1]:35900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNg7R-0001sR-1Q for submit@debbugs.gnu.org; Thu, 02 Feb 2023 15:23:41 -0500 Received: from lists.gnu.org ([209.51.188.17]:56656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNg7P-0001sJ-HZ for submit@debbugs.gnu.org; Thu, 02 Feb 2023 15:23:40 -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 1pNg7P-0007QU-Am for guix-patches@gnu.org; Thu, 02 Feb 2023 15:23:39 -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 1pNg7N-0005dP-KC for guix-patches@gnu.org; Thu, 02 Feb 2023 15:23:39 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 406FAE86FE for ; Thu, 2 Feb 2023 20:23:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NHQDdnQMUEGr for ; Thu, 2 Feb 2023 20:23:32 +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 566D0E85C0 for ; Thu, 2 Feb 2023 20:23:32 +0000 (UTC) From: Simon South Date: Thu, 2 Feb 2023 15:23:30 -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-Seal: i=1; s=key1; d=yhetil.org; t=1675369455; a=rsa-sha256; cv=none; b=SswN9DKw6g+Kt0gZFLo67+t5uwgd5R50VXLVcZwF5z2yKzgFq8pDMY3m0vpEUVex4dmgA7 4ozJmxa2Rrh5AjITc2AZwDvPY2UAYSjrt3WisWRoZnnbZ7hBkoqd5r58luFmSWaaLEs3Hd +EwRC6myYd2tHRg9xtCV1ORcPKKT6+CUFntMe6Px1xCO94KQcq5NMLaJBM+NfMJvGE076h isApFvsQb/hDSgRQzVhd2MGGpBTrnxRWbyArLdsWqVvg/yO4SmQagb4IlLbol4YmPEmCdD lU95L4J2tcl15ZrBx+QcCTSEFtAoJ8k7weYVev8cYpKzo+dxkAVbTFfLsopl4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1675369455; 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=XVFVeq80dxsbxfD71wnPGtCNChJFW511FpfxfK+hPHY=; b=iCbTMeLlc9UyElcwOxoU4My00hBT8GfOug7fENNnoFpb1BoJpyBI77IqaFp5OUH2+zVUJx OcvSfdROMShQXNCE+DzBo1Pf2KfUIl0PCqFyQiqKUUt5DdP+oBwMlDXq0OEp+LfaM2tL36 EAAho7IYIeQX6aaR28tnJ/dmLES4nEXkLdFMsZcYq16Ou4OEmOP11LzUY6sJxoqx4Pue+R nZG1dzBzJhLuiP/x+oxRVtendU6Pv6XkqBBuk3o5kA0uOJ0xVzep21iEdL9qmKpa3CKgZy G3ej/FFCCoi5yrbG49/nfnCNpxpDgipi646JSrPfSo8nWG9EvFrNm1sOpsL8jw== X-Migadu-Spam-Score: -0.48 X-Spam-Score: -0.48 X-Migadu-Queue-Id: 3E2D81E61E X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" X-TUID: fsE+wJJixmrl Currently the font-google-noto-emoji package correctly specifies the font's license as the SIL Open Font License but inadvertently installs a copy of the Apache license instead in the package's output. This is because the source package groups the font's data and license files together in a "fonts" subdirectory, while the license file at the top level applies to "Tools and most image resources" according to the package's README.md. By default, it's the file at the top level that's installed. The patch that follows corrects this issue. I've tested it on x86-64 and AArch64 and it seems to work fine. -- Simon South simon@simonsouth.net Simon South (1): gnu: font-google-noto-emoji: Install correct license file. gnu/packages/fonts.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) base-commit: 301f12832601eef6b130f3946d9d597ae43a514a -- 2.38.1