From unknown Sun Jun 22 17:12:16 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61237 <61237@debbugs.gnu.org> To: bug#61237 <61237@debbugs.gnu.org> Subject: Status: [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file. Reply-To: bug#61237 <61237@debbugs.gnu.org> Date: Mon, 23 Jun 2025 00:12:16 +0000 retitle 61237 [PATCH 0/1] gnu: font-google-noto-emoji: Install correct lice= nse file. reassign 61237 guix-patches submitter 61237 Simon South severity 61237 normal tag 61237 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 15:23:41 2023 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 To: guix-patches@gnu.org Subject: [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file. 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Feb 02 15:25:08 2023 Received: (at 61237) by debbugs.gnu.org; 2 Feb 2023 20:25:09 +0000 Received: from localhost ([127.0.0.1]:35905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNg8q-0001vR-GW for submit@debbugs.gnu.org; Thu, 02 Feb 2023 15:25:08 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:56224) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNg8p-0001v2-Pg for 61237@debbugs.gnu.org; Thu, 02 Feb 2023 15:25:08 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 0EA12684AA for <61237@debbugs.gnu.org>; Thu, 2 Feb 2023 20:25:02 +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 cCE04FncYkwv for <61237@debbugs.gnu.org>; Thu, 2 Feb 2023 20:25:01 +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 C62AE6847F for <61237@debbugs.gnu.org>; Thu, 2 Feb 2023 20:25:01 +0000 (UTC) From: Simon South To: 61237@debbugs.gnu.org Subject: [PATCH 1/1] gnu: font-google-noto-emoji: Install correct license file. Date: Thu, 2 Feb 2023 15:25:00 -0500 Message-Id: <9cdb17536af83f33eff8788bbba4500e83fbdf54.1675368905.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61237 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/fonts.scm (font-google-noto-emoji)[arguments]<#:phases>: Add "enter-font-directory" phase; remove now-superfluous prefix from paths in "remove-unsupported" phase. --- gnu/packages/fonts.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 634c48db00..06b1c43d82 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -982,11 +982,15 @@ (define-public font-google-noto-emoji (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-unsupported + (add-after 'unpack 'enter-font-directory + (lambda _ + ;; Note this ensures the correct license file is installed. + (chdir "fonts"))) + (add-after 'enter-font-directory 'remove-unsupported (lambda* _ - (delete-file "fonts/NotoColorEmoji_WindowsCompatible.ttf") - (delete-file "fonts/Noto-COLRv1-noflags.ttf") - (delete-file "fonts/Noto-COLRv1.ttf")))))) + (delete-file "NotoColorEmoji_WindowsCompatible.ttf") + (delete-file "Noto-COLRv1-noflags.ttf") + (delete-file "Noto-COLRv1.ttf")))))) (home-page "https://fonts.google.com/noto/specimen/Noto+Color+Emoji") (synopsis "Font for rendering color emoji characters") (description -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 01 10:52:01 2023 Received: (at 61237) by debbugs.gnu.org; 1 Mar 2023 15:52:01 +0000 Received: from localhost ([127.0.0.1]:54681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXOkL-0000Qu-1t for submit@debbugs.gnu.org; Wed, 01 Mar 2023 10:52:01 -0500 Received: from mira.cbaines.net ([212.71.252.8]:42320) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXOkI-0000Ql-T0 for 61237@debbugs.gnu.org; Wed, 01 Mar 2023 10:51:59 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id 7791E16CBF; Wed, 1 Mar 2023 15:51:58 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id fe0592bb; Wed, 1 Mar 2023 15:51:58 +0000 (UTC) References: User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines To: Simon South Subject: Re: [bug#61237] [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file. Date: Wed, 01 Mar 2023 15:50:11 +0000 In-reply-to: Message-ID: <87mt4wwjtu.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61237 Cc: guix-patches@gnu.org, 61237@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Simon South writes: > 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. Looks good to me, I've pushed this master as 9a4dd01f1da2681fef8f89d43a43efa4ccbb5a16. Thanks, Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmP/dJ1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XfceQ/7BA0Irr0Sr+ULl96khWVQFIElS5kmPDnj GnCV52QR+00jQ21H5zdR/O4//1V2WCQrCJyCR1HOq8q72UzgAMbC4m8ECOdbwIh9 75eUFnrJLIk+NBXA7vl9ebe3NkWuPcWLVWOVMG/M5GlgvMVqTZJClgJsrLlLHfqg l4WU84WxKo9hTr+p+pAeGHhuJMziZ+RjKOHfMZQ9hWCMT1XU2fRL4pAgeNlGt/Pp lipGu7H1QO5VU/FIE2w/LWLAqSy+Na8S81lh+KkUwYf2OPp7o8TBNzbFNLgoR1ql pVJHgxiLn7AmS2N9yxxSJxM7w+3rN+Pk6dpZJFY0A8n0wmyur8idD9Fw7+8Yi7U7 W56C4cwZwclUPExu5uEFQmxDKFj78bFnhBKnrteSwWSKKqmqRMY8PmdFRpJ2MJV0 YQiF1VW846dvtg6/N2xwzcTMyEKUqenb3tqP8JcdTsYdycR3XwazwERYIOoy5tAe XudQXxJ1dJNq18WxTm7Nz05lkRpNPnohuL38LgPkW0/VbDLND+BNaPt+BILhwwZv ON/d6l7xchCkLyu3hcaiJjnavn1xYODo57/Gc63pZZaFduYoXtTNRHB3/BRJ1tzo qlt6AG4D2HwP1iBNghKGuBFU0E+lm3iKibkG/51Hn6gxaR/6/QaqHKgLskqbCqi3 DHDtcI6B1y4= =w+G/ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 01 10:52:23 2023 Received: (at 61237-done) by debbugs.gnu.org; 1 Mar 2023 15:52:23 +0000 Received: from localhost ([127.0.0.1]:54690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXOkg-0000SJ-Pf for submit@debbugs.gnu.org; Wed, 01 Mar 2023 10:52:23 -0500 Received: from mira.cbaines.net ([212.71.252.8]:42322) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXOkf-0000SC-Ky for 61237-done@debbugs.gnu.org; Wed, 01 Mar 2023 10:52:21 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id 23F1816CBF for <61237-done@debbugs.gnu.org>; Wed, 1 Mar 2023 15:52:21 +0000 (GMT) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 717c2f19 for <61237-done@debbugs.gnu.org>; Wed, 1 Mar 2023 15:52:20 +0000 (UTC) References: User-agent: mu4e 1.8.13; emacs 28.2 From: Christopher Baines To: 61237-done@debbugs.gnu.org Subject: Re: [bug#61237] [PATCH 0/1] gnu: font-google-noto-emoji: Install correct license file. Date: Wed, 01 Mar 2023 15:52:04 +0000 In-reply-to: Message-ID: <87ilfkwjt7.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 61237-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Marking as done. From unknown Sun Jun 22 17:12:16 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 30 Mar 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator