From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 6526692B1; Thu, 13 Feb 2025 14:55:40 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 757AD923D; Thu, 13 Feb 2025 14:55:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: * X-Spam-Status: No, score=1.7 required=5.0 tests=ARC_SIGNED,ARC_VALID, DATE_IN_PAST_12_24,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DMARC_PASS, FORGED_SPF_HELO,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 Received: from CWXP265CU008.outbound.protection.outlook.com (mail-ukwestazlp170100001.outbound.protection.outlook.com [IPv6:2a01:111:f403:c206::1]) by atuin.qyliss.net (Postfix) with ESMTPS id ABD0C92A7 for ; Thu, 13 Feb 2025 14:55:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OkkOYTXmwzB0dSw++T17jaAw5JtqNRsK+vn/intfYrokb42cWLzYMDKY2q8J4qK4Q4KDJBIRUlc7GavAYBTp/0iFt7au9cz+ymRgDzcF6w4WrCj7nLwelYQmS0qjVBye9NbKXxicaQnbp/VCvfErzcGvF+aEgeDAYQ0WNi9Q9eW8dH0Q4Ff7hapOP4kRtdEKy8+02Yy8TXq80xOfzSSlL/BgvHl/38vAV3ocytFhgmVbDu2fN85SJ7+bgblaMv7tj5yOGP9O6dtd522DCl1pmLHfk3oqTnEmHi420NSanZyGeSUMeGdcPoIQGMV95vqr9aRp0HcwxewbNksvuHz2sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2SBmuJ0pYLKySWMUu0lz4WHigdp/E5pwTkJoLa0WeSo=; b=Q/uwNeCfEQ21uxjFDCulqVdPdHhnFXugNErDnLG6AO4PnaGJ6Ns2DMYMyfVx+VneIm8DKPIeHUdMGkqtNmt03K456ykhhULOOCvyIgcfCnoSyBsjIh5r3eOCCKgZ5s85g/EfbsbdToej5pg5wRlMfDfmG46BDiuOvkWPL6XUgdubSFGtctzazzEToZTkVI6n4mrs9kOTdUXpjVDsx2gMEjT8Gw3I+fW8zcK9UEkv9nr1pfxfo1/nBnWDi5YmRbWXnCPKEZtoLhUv7grmzT8OH3L2uX0HRb2HG3xlSnyYp083Slq+cuqEeUdGKHyoG+NdwHEBFXY4FYkHc6jPuJtxTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 62.210.214.198) smtp.rcpttodomain=alyssa.is smtp.mailfrom=shymega.org.uk; dmarc=pass (p=none sp=none pct=100) action=none header.from=shymega.org.uk; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shymega.org.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2SBmuJ0pYLKySWMUu0lz4WHigdp/E5pwTkJoLa0WeSo=; b=BRe0DHbriHqb5euWg4KQnxP8y2XRbKT58M+sdjQz+2y/qMrM9+ELR+3zsrY7nDByOyJEGWfji4r5GVut0iqMnNSbFnSOPOSmVfEqJkW8RnAwJqsJVt9u60z061y6QhlBudDLS5ge+bjr4HSFRKH0/XXbt+bAZvPbprTjsOUNB1uzTFIQrvHUetTeMsl6aXWGnbdE7O0OZWrx4XK1Kjt15S02vQFOawKz5PmVl8+4wN8cYcdlkq8FZ2JAhCOefSp+JKtqSNjPsF8ZRcBj/Uz12LtgNWgJ1MOvOpxc8EJpLcSA3LSJHaoPy7AeSqb84UO/QhdP6Ae+jG70I7oo8a/cDQ== Received: from CWLP265CA0520.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:18c::23) by LO2P265MB5231.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:256::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.16; Thu, 13 Feb 2025 14:55:27 +0000 Received: from CW2PEPF000056B9.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:18c:cafe::63) by CWLP265CA0520.outlook.office365.com (2603:10a6:400:18c::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.14 via Frontend Transport; Thu, 13 Feb 2025 14:55:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 62.210.214.198) smtp.mailfrom=shymega.org.uk; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=shymega.org.uk; Received-SPF: Pass (protection.outlook.com: domain of shymega.org.uk designates 62.210.214.198 as permitted sender) receiver=protection.outlook.com; client-ip=62.210.214.198; helo=oracle.rodriguez.org.uk; pr=C Received: from oracle.rodriguez.org.uk (62.210.214.198) by CW2PEPF000056B9.mail.protection.outlook.com (10.167.240.4) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.10 via Frontend Transport; Thu, 13 Feb 2025 14:55:27 +0000 Received: from DEUSEX-LINUX.localdomain (unknown [217.155.6.253]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) (Authenticated sender: dzrodriguez) by oracle.rodriguez.org.uk (Postfix) with ESMTPSA id 7E227ACA0054; Thu, 13 Feb 2025 14:55:26 +0000 (UTC) Received: from DEUSEX-LINUX (localhost [IPv6:::1]) by DEUSEX-LINUX.localdomain (Postfix) with ESMTP id E3B6A1A919E; Wed, 12 Feb 2025 19:53:50 +0000 (GMT) Date: Wed, 12 Feb 2025 19:53:50 +0000 From: "Dom (shymega) Rodriguez" To: Alyssa Ross Subject: Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file Message-ID: References: <20250208133634.1963410-1-samy+spectrum@lahfa.xyz> <871pw4gznc.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <871pw4gznc.fsf@alyssa.is> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CW2PEPF000056B9:EE_|LO2P265MB5231:EE_ X-MS-Office365-Filtering-Correlation-Id: 87eec3b0-6e1d-49a2-737c-08dd4c3e73e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZXJLRHVVQmROWjNyUzlKaThOVGJ0Wjd3cU1pOXhPMjlHUTBvNGNwRVZ6RldT?= =?utf-8?B?ZUhuZkgxUnF0aUdHN1IxK1NuMkxTMXVCN2hkelJSeE9tcTEwWVlpS2hKVWZG?= =?utf-8?B?Q1NzWGZCKzE1NUpycVRKaFZtKzVzTTluWWR5TlQrdmJlK1ZyQk02SFMvSXdQ?= =?utf-8?B?RlcxdEV6aWI1WnNSNjBJeXpIN1daVGxZRU1vclJuKzhVRTE5dDVoVzlrdzBM?= =?utf-8?B?WHZ4dXhhZVhpaXAvelFvOVBmZms2ZUowcGlMQTRYM0REOFFNNlQ4SWtjWFNO?= =?utf-8?B?YWRlYmx0ZGVxT1lqZkgybTByQ2Z3SW5mWmorVFhKaXlFRzN2VHBrcVFQMU10?= =?utf-8?B?dUFhOVhVYnlRdTRLbHNRYVl0U2x3YVhGeUpMbzk2c2ErUVVjZTd2NlpXWjM3?= =?utf-8?B?L3FBc3F3SUQ1U0lOcVRtZXhKSUFwRkJrZzM5cjViT2JVb0p1U2VQL0E0emp0?= =?utf-8?B?alNPdDZwSmlNQ0ZyS1Bnamd4VVpqK0NZSzR0OHVZQUZLOW4zZTZ1RjI4aFhr?= =?utf-8?B?dmxqYnJsL3h1L0VvMXFNZCtLMW02aFJWbmEwaUl1VXZSMlNDN3Bkd0FWaytB?= =?utf-8?B?akY3RmR6ZDBxWEVSa0VPZ2xzaVFEOTRpc2RMQkorYWNDM2FmNHBDYVRmaTdl?= =?utf-8?B?dHhHT3dYdmNIbVNHZ3FlSGVGRGd0NklHc2d1YnBLMFhvNWREeDFaMFJYYWFD?= =?utf-8?B?Q0RZeEZHL3UvY1ZFWHBOcVhZamFiU2RQSGlFZEowQy9uRi9PTVFnZFFwOWZT?= =?utf-8?B?dXZobTU0alNWUUZIN1hoTlV4LzRSL1JDQ0ZaS3MzMllCZy9iSCtMZkRNTHZB?= =?utf-8?B?dzJmV2ZVd2NLTVk5ZEpLY3FERkZ4dkxVUllzaitBRUM5eXFiNkZjSS9KcFRW?= =?utf-8?B?QVVJRWRVYnQrZDNmOCs3VHhaNmVxanQrUlhXVjdhUXZnSzZCYzg5NlVHTDhn?= =?utf-8?B?Z3pOakNWSmh2WlpRUUkwajNodFZmaGYvS1ZUV04wY052Rk0yWVNxckc0NzR4?= =?utf-8?B?eDg2QWlPTllFMzliY3RBbnR6WlhYblcyL09mMXJGalNrQjZBSmlmMHRwUkZv?= =?utf-8?B?MmcxcmVEeUQxWUs1MjNBTU90ZHh0dDc5RmRGNVZGaEd6YWRGSDg4RGZPK2dz?= =?utf-8?B?endORm5mMUF4T2hnM3BKL0dIYytGR0d0WDNLbGhyNi9RL1UvenUrN0RVUEEw?= =?utf-8?B?SW1ybk1zN3M0eURhMGk3YUhWS1JUM1Q4ZkhiMUhsRmhyOUYvTTRiKzlZbEFw?= =?utf-8?B?M0toUlkzcEtHdlBEckFsdWo1WlZRMkpoaDBDeWhsUHRFSnp4NXVmOWFubzFI?= =?utf-8?B?cmdkMHVTbVZFdVlzMS9jbWNSVVdYMHBWTXphZ016QjJZSWtSeDBzSmYvMXJk?= =?utf-8?B?N3RiTU9FZzRQbi9YLzAwN2N2WkUxaXpKOXRVVk1rWlVkVUpMejhyRnQ5RFlN?= =?utf-8?B?c3BLMFBndnR2VVdkQVlsOU5kNnZsTVRCUXY0QUhvV04yY0dtby9iL21KaTNh?= =?utf-8?B?dWl1TC9pUHlJenVucm9PNXoxSjNlakE4SEVYOWNiaDlFZnVOZzBkYWZ4WjZ1?= =?utf-8?B?eUdKeXdMSm85TGhSNkxwd1ptQm9FQk54ekxuUjZwM09yc0xqSFpTMFB6Yzlx?= =?utf-8?B?WFJNUGtVSGJhRWV6dng1YjQ1NXNrdjExbno5QnhFZXI4V29PSU1XcHlBajVw?= =?utf-8?B?WldTTGhYaVdSRGd5cjQzTHdMaWljbS82Rm5KL2gyeVV6NnZHWU1oc1hBTTZt?= =?utf-8?B?bmROTFlSTVV0b2x3QXpPOWNTa1BITzFTZ01HeXpORHNVMm5GbGVnbE53UG9h?= =?utf-8?B?UjB1ZU8zMGliNGora2djUkJJWlVUZnFhMlJ1TWYzRXNFdHVQeUR1eFJ4TzF4?= =?utf-8?B?anIwVnVwbmhJcFFreGRlL2hGQ2pPSk84Rk9EVndYNmlRME9CcVZpZWFXMUM0?= =?utf-8?B?Rk5qckJuMXhiWXpnRy9tYVcyNTZvZFlVNzZDVWRUb1dYenNYd0w5enIrdkJo?= =?utf-8?B?MWFrVm1JMjZ3PT0=?= X-Forefront-Antispam-Report: CIP:62.210.214.198;CTRY:FR;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:oracle.rodriguez.org.uk;PTR:oracle.rodriguez.org.uk;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1102; X-OriginatorOrg: shymega.org.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2025 14:55:27.2266 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 87eec3b0-6e1d-49a2-737c-08dd4c3e73e5 X-MS-Exchange-CrossTenant-Id: 7e15dc52-0465-4028-b82a-3c894bbc5ba6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=7e15dc52-0465-4028-b82a-3c894bbc5ba6;Ip=[62.210.214.198];Helo=[oracle.rodriguez.org.uk] X-MS-Exchange-CrossTenant-AuthSource: CW2PEPF000056B9.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO2P265MB5231 Message-ID-Hash: 3ARA2CFS2THOHMJCADGU4IBHIMJUWG4A X-Message-ID-Hash: 3ARA2CFS2THOHMJCADGU4IBHIMJUWG4A X-MailFrom: shymega@shymega.org.uk X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Samy Lahfa , devel@spectrum-os.org X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 11.02.2025 18:27, Alyssa Ross wrote: >"Dom (shymega) Rodriguez" writes: > >> On 08.02.2025 14:36, Samy Lahfa wrote: >>>Signed-off-by: Samy Lahfa >>>--- >>>This fixes the foot terminal app-vm by adding dejavu_fonts package to the >>>nix store as well as adding the fontconfig file, so it knows which >>>default font to use. >>> >>> img/app/Makefile | 2 ++ >>> img/app/default.nix | 3 ++- >>> img/app/etc/fonts/fonts.conf | 21 +++++++++++++++++++++ >>> 3 files changed, 25 insertions(+), 1 deletion(-) >>> create mode 100644 img/app/etc/fonts/fonts.conf >>> >>>diff --git a/img/app/Makefile b/img/app/Makefile >>>index 7887aa8..eeb17fa 100644 >>>--- a/img/app/Makefile >>>+++ b/img/app/Makefile >>>@@ -30,6 +30,7 @@ $(imgdir)/appvm/blk/root.img: ../../scripts/make-gpt.sh ../../scripts/sfdisk-fie >>> >>> VM_FILES = \ >>> etc/dbus-1/session.conf \ >>>+ etc/fonts/fonts.conf \ >>> etc/fstab \ >>> etc/init \ >>> etc/mdev.conf \ >>>@@ -52,6 +53,7 @@ VM_FILES = \ >>> etc/s6-linux-init/scripts/rc.shutdown \ >>> etc/s6-linux-init/scripts/rc.shutdown.final \ >>> etc/xdg/xdg-desktop-portal/portals.conf >>>+ >>> VM_DIRS = dev run proc sys tmp \ >>> etc/s6-linux-init/run-image/service >>> VM_FIFOS = etc/s6-linux-init/run-image/service/s6-linux-init-shutdownd/fifo >>>diff --git a/img/app/default.nix b/img/app/default.nix >>>index 6537fb2..5b58a5f 100644 >>>--- a/img/app/default.nix >>>+++ b/img/app/default.nix >>>@@ -8,7 +8,7 @@ pkgsStatic.callPackage ( >>> { lib, stdenvNoCC, runCommand, writeClosure >>> , erofs-utils, jq, s6-rc, util-linux >>> , busybox, cacert, execline, kmod, linux_latest, mdevd, s6, s6-linux-init >>>-, xdg-desktop-portal-spectrum >>>+, xdg-desktop-portal-spectrum, dejavu_fonts, >>> }: >>> >>> let >>>@@ -37,6 +37,7 @@ let >>> s6-rc >>> terminfo >>> xdg-desktop-portal-spectrum >>>+ dejavu_fonts >>> >>> # Some packages can't (currently?) be built statically. >> >> Alyssa, are we aiming for a alphabetically-sorted list of packages in >> this file, or is it good as-is? > >Basically any time a list is alphabetically sorted, it should be kept >alphabetically sorted. Understood. Do we have this in a 'contributing guidelines' document? > >>> >>>diff --git a/img/app/etc/fonts/fonts.conf b/img/app/etc/fonts/fonts.conf >>>new file mode 100644 >>>index 0000000..0dcde54 >>>--- /dev/null >>>+++ b/img/app/etc/fonts/fonts.conf >>>@@ -0,0 +1,21 @@ >>>+ >>>+ >>>+ >> >> Alyssa - is CC0-1.0 OK here, or would you prefer something else? > >Yeah — this is actually a copy of an existing file in the tree, >host/rootfs/etc/fonts/fonts.conf, so keeping the copyright and license >information the same was the right thing to do. ack. > >>>+ >>>+ >>>+ >>>+ monospace >>>+ >>>+ DejaVu Sans Mono >>>+ >>>+ >>>+ >>>+ >>>+ sans-serif >>>+ >>>+ DejaVu Sans >>>+ >>>+ >>>+ >>>+ /usr/share/fonts >>>+ >>>-- >>>2.47.2 >>> >> >> The only thing I'd like to see would be the description in the commit >> message, not in the email annotation - this would need to be a v3 patch, >> but when I apply this patch, I can't see the description in the tree, so >> it's hard to understand the reason for the commit. >> >> Other than that, thank you for your contribution - just need to fix the >> commit, and then check with Alyssa about list sorting and the license. > >Yeah, to clarify this: when "git am" applies a patch, everything after >the "---" is discarded, so stuff that's intended for the commit message >should go before that. It's sometimes useful to put extra information >that doesn't need to make it into git after the "---", but most of the >explanation of the change should go before. Sorry, should have clarified on my part. I was in 'technical mode'. >Samy, both of the remaining issues here (the list sorting, and the patch >description) are pretty trivial — you can send a v3 if you'd like, but >I'm also just happy to just apply this patch and fix it up as I do so. >What would you prefer? No objection from me on fixing up the patch on your side, Alyssa. I certainly don't want to make the barrier to entry for contributing higher. Best wishes, -- Dom Rodriguez