From patchwork Thu Feb 2 20:25: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: 46610 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 7B54F27BBEB; Thu, 2 Feb 2023 20:26:31 +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 763F227BBE9 for ; Thu, 2 Feb 2023 20:26:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNg9s-0007kR-8O; Thu, 02 Feb 2023 15:26: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 1pNg9j-0007i2-0Y for guix-patches@gnu.org; Thu, 02 Feb 2023 15:26: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 1pNg9i-0006i9-Ou for guix-patches@gnu.org; Thu, 02 Feb 2023 15:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNg9i-0001x4-Ks for guix-patches@gnu.org; Thu, 02 Feb 2023 15:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61237] [PATCH 1/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:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61237 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61237@debbugs.gnu.org Received: via spool by 61237-submit@debbugs.gnu.org id=B61237.16753695097409 (code B ref 61237); Thu, 02 Feb 2023 20:26:02 +0000 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 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 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-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