From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 6N54GmrqJGazLQAAe85BDQ:P1 (envelope-from ) for ; Sun, 21 Apr 2024 12:28:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 6N54GmrqJGazLQAAe85BDQ (envelope-from ) for ; Sun, 21 Apr 2024 12:28:58 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=q8GJM0oG; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713695338; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cZyq9fGFDlz96XtWcTwSXk2vduN4LDIBxZyMOtpWKvQ=; b=LeRi2lDHFl45S03PNr+c0LwvceU4xzz4AXb/y1GqXt/ln0XoTi8rW1WgOK9URBb3q/6NCR FKOcdYcfkeI0hBmYU1lMKaTNXmxi68FszUZYOYaSu4YGO6XcOwTmpEjGoULUyampyA6ITU iodw2nZr25AMb8EouOXK60I01iN2tqzfXalAd8pvdvzF9e1EjjozWdfwCiPTtDiPJNY+6P Qu/oh0/eOzfakKqXI8ZNceKKNoRiWtd92P/DE2Ec+UrfycmkMW8sf5r6JXrd8DG8I2/5+n X6fhChpxjoKwNrbreQaaeXeHrUVmhFhymX5J7KYnOnR+QUBTXrYyAafjTPe4PQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713695338; a=rsa-sha256; cv=none; b=ShECmu0Z8zLReGO9Gs+m42Mo0XsivlXgHZcpk4mu5TBiB4IOVQu9Of8o9bF2T19YYaKoiR 5iQJn2EHL6bd9j/O2GKdlNlnoVk9F374tw2rNJhG9YBOHXvC0WkOfUWKtxXUEyk6SsiSx9 MgW/ZePIxR5JGDra9PMODvSzMqYNY+KTQCewVpm2jObNNkyAF5mTlmB+EvR20QaM9IIyeZ HNYwUBy2UropnA+hFref1U4ux4vZMstChKwdVfFR8zPqkzERbwh24DomrfZ42aQ1UrBzS8 0SCamWTt+XE0k3qamY5cu4rufsnF4+I2bYZOjMbyj8ZmrPPlENZSBthqitSiXw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=q8GJM0oG; 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=pass (policy=none) header.from=gnu.org 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 188DE578BC for ; Sun, 21 Apr 2024 12:28:58 +0200 (CEST) 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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 From: iyzsong--- via Guix-patches via 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 X-Migadu-Spam-Score: -6.88 X-Spam-Score: -6.88 X-Migadu-Queue-Id: 188DE578BC X-Migadu-Scanner: mx13.migadu.com X-TUID: UcPJmYWZaP+k 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 -- 2.41.0