From patchwork Sun Apr 21 10:28:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 63266 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 3737927BBEA; Sun, 21 Apr 2024 11:28:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 E899427BBE2 for ; Sun, 21 Apr 2024 11:28:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryURG-0007mf-75; Sun, 21 Apr 2024 06:28:50 -0400 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 1ryURE-0007mC-Ud for guix-patches@gnu.org; Sun, 21 Apr 2024 06:28:48 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ryURE-0001XB-MZ for guix-patches@gnu.org; Sun, 21 Apr 2024 06:28:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryURT-0003Ve-Jr for guix-patches@gnu.org; Sun, 21 Apr 2024 06:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70496] [PATCH 01/14] build-system: font: Handle multiple outputs in the install phase. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Apr 2024 10:29:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70496 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70496@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 70496-submit@debbugs.gnu.org id=B70496.171369529212953 (code B ref 70496); Sun, 21 Apr 2024 10:29:03 +0000 Received: (at 70496) by debbugs.gnu.org; 21 Apr 2024 10:28:12 +0000 Received: from localhost ([127.0.0.1]:42141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryUQe-0003Mr-AU for submit@debbugs.gnu.org; Sun, 21 Apr 2024 06:28:12 -0400 Received: from mail.envs.net ([5.199.136.28]:40864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryUQb-0003Ml-Ty for 70496@debbugs.gnu.org; Sun, 21 Apr 2024 06:28:10 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 0C36938A1B2F; Sun, 21 Apr 2024 10:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1713695274; bh=cZyq9fGFDlz96XtWcTwSXk2vduN4LDIBxZyMOtpWKvQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q8GJM0oG9DBYzgONEKhA7njyZcTRCdVilFW+pzVb14pVcyzj9Ra9uy6Dn8qo1aj45 zJ5Kr2hEMJA0gH3ywv1UU14uZieOVhhIfDaQ4Ri2tjrDH8E3PGmfSeXkWDO0rEnUFQ BFGrcCF0r7VvTRuJLcM7aQoYZXskT29ZtG9h3dH51xoNTc3HILTwihBJ1+ArW6JXEy l0sXvhCVaVvSzm/AJGqxcdtWclyKs8Q8R5xjnsnPrg00+rUkqKMh3HA6RPBR6d5xLG 6it9vW8NyO2QJ1DqQldgAEmfbelJ3B4ULuVH7iM55Ovw4miGsTQvMUuaawH83yvhDW RwIz2kEbtggD0dtEVIB3Elc2AEnxzrvNuU+9hStojz7BQ41LmEbgIrs9dedQ9ydtnM iwVgMyU3A0Hn/USqvHCVXGnGmXXohH+2LcuEMBkmu8+aZWqQyTtD5vEE2EMn5FTvyF kDbC2dPbxTwKrtguI4+euXo4et9F8zwOg2Nk0hXeayPkneCD8o6rQycpxUQVMrFuY7 F0JZ8Wh6Mne+PDavt2Na7qO44zXEwusGu1T9dvGRZG0hjC8vtLbOeIVPKoRG+OG37N 5YEDF7CnIw3wmvqu/RilX5mstZclFnjjA0XvrGHfL1j/hkh8iOelPXBrhOJH9qDiUX 3wVvlx/Xvv/naOtova68+oQw= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id c4IuQdo1WeoP; Sun, 21 Apr 2024 10:27:50 +0000 (UTC) Received: from localhost (unknown [36.170.58.193]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sun, 21 Apr 2024 10:27:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 42b71cca; Sun, 21 Apr 2024 10:29:00 +0000 (UTC) Date: Sun, 21 Apr 2024 18:28:35 +0800 Message-ID: <414d9dda0aedde45e5673333f5ad90abbb32cc70.1713693629.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * guix/build/font-build-system.scm (install): Prefer install files into their specified outputs (ttf, otf, woff, otb, bdf, pcf, psf). Change-Id: I2ecd126fe31ce4fc65c59106938e37523b0cc3d2 --- guix/build/font-build-system.scm | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm index e4784bc17d..bd166c4afe 100644 --- a/guix/build/font-build-system.scm +++ b/guix/build/font-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2022 Arun Isaac ;;; Copyright © 2017 Alex Griffin +;;; Copyright © 2024 宋文武 ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,13 +49,34 @@ (define* (install #:key outputs #:allow-other-keys) "Install the package contents." (let* ((out (assoc-ref outputs "out")) (source (getcwd)) - (fonts (string-append out "/share/fonts"))) - (for-each (cut install-file <> (string-append fonts "/truetype")) + (truetype-dir (string-append (or (assoc-ref outputs "ttf") out) + "/share/fonts/truetype")) + (opentype-dir (string-append (or (assoc-ref outputs "otf") out) + "/share/fonts/opentype")) + (web-dir (string-append (or (assoc-ref outputs "woff") out) + "/share/fonts/web")) + (otb-dir (string-append (or (assoc-ref outputs "otb") out) + "/share/fonts/misc")) + (bdf-dir (string-append (or (assoc-ref outputs "bdf") out) + "/share/fonts/misc")) + (pcf-dir (string-append (or (assoc-ref outputs "pcf") out) + "/share/fonts/misc")) + (psf-dir (string-append (or (assoc-ref outputs "psf") out) + "/share/consolefonts"))) + (for-each (cut install-file <> truetype-dir) (find-files source "\\.(ttf|ttc)$")) - (for-each (cut install-file <> (string-append fonts "/opentype")) + (for-each (cut install-file <> opentype-dir) (find-files source "\\.(otf|otc)$")) - (for-each (cut install-file <> (string-append fonts "/web")) - (find-files source "\\.(woff|woff2)$")))) + (for-each (cut install-file <> web-dir) + (find-files source "\\.(woff|woff2)$")) + (for-each (cut install-file <> otb-dir) + (find-files source "\\.otb$")) + (for-each (cut install-file <> bdf-dir) + (find-files source "\\.bdf$")) + (for-each (cut install-file <> pcf-dir) + (find-files source "\\.pcf$")) + (for-each (cut install-file <> psf-dir) + (find-files source "\\.psfu$")))) (define %standard-phases (modify-phases gnu:%standard-phases