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 D6511102C7; Tue, 11 Feb 2025 17:27:53 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 223A7102BC; Tue, 11 Feb 2025 17:27:48 +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=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS, URIBL_SBL_A autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-b1-smtp.messagingengine.com (fhigh-b1-smtp.messagingengine.com [202.12.124.152]) by atuin.qyliss.net (Postfix) with ESMTPS id 09A2C102BA for ; Tue, 11 Feb 2025 17:27:43 +0000 (UTC) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.stl.internal (Postfix) with ESMTP id B00172540113; Tue, 11 Feb 2025 12:27:40 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-11.internal (MEProxy); Tue, 11 Feb 2025 12:27:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1739294860; x=1739381260; bh=JleOacQ63B Rp4mZQLq/pvr3OjOjQwywSleVYf/21RFs=; b=CiMJ/PHqIjFjguz9lvgKqj8Nwa XvYdG7o1QPYSG0pEnx3FsXEFpvduC4AgpthzLV0slUivB7AfoX5c3k8V2OTw7jtF Z9/FzTJQMWFYeuRAfzmJz3P9M92TP+M/pafugf8dimvezmd9+g8pj4GhXTkqy9l9 n90Rz80pO4CCzLaLwq+2BdOJqiSQOpXIy+yRXtJWKVySL2IhmL47qZd3PAA8xQuo EZ9cuSqN8pwa7DzGSZQDJ3TQOY0sJuYm8aLzjy9K7y8FzXsF1YJrb7Ijg1zLK2of yHQAxuHrnJVJZ6GX6+ssxvHk/GO7vFDBAJRO8ofqNtAgLVFbA3zAW/RcTx4Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t= 1739294860; x=1739381260; bh=JleOacQ63BRp4mZQLq/pvr3OjOjQwywSleV Yf/21RFs=; b=bxQ/u/M98ZF1CparUa2L4hFd/BfKZC+R0e5fhrLBlDXWTCZrA3m cwStqPZP4wlSykF3zKe57hxhTGBJeGpK09vbyPT/V6vURj2s+y/ivyDGvIyOqS2Z lm9WWUyMdd8wVn3/n78kQTw7etF56u91ZicMwJZBDBuZIccL3h1khH/rkgq8G4HZ vxRZiMsAXM63FRiPdT+AMaO8Pf40h49Kh263XtZlaetwCPiizGDhra1wVIsP4NIy W3X/jiUoNgqR5VD414HNMv4UMgUeAkD7y93l5h1mgpL8GEZHWqEHU8LPfBE0lptt pGMhkeyqW3Wzk6uUWTZMNkksl5PZL0nAY+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdegudeitdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivg hnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesghdtreertddtjeen ucfhrhhomheptehlhihsshgrucftohhsshcuoehhihesrghlhihsshgrrdhisheqnecugg ftrfgrthhtvghrnhepteelveeuuedvjefhudduffeikeejkefgleeuveduiedvuedvfeet udeikeeikeegnecuffhomhgrihhnpehshhhuthguohifnhdrfhhinhgrlhenucevlhhush htvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihsshgr rdhishdpnhgspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtoh epshgrmhihodhsphgvtghtrhhumheslhgrhhhfrgdrgiihiidprhgtphhtthhopehshhih mhgvghgrsehshhihmhgvghgrrdhorhhgrdhukhdprhgtphhtthhopeguvghvvghlsehsph gvtghtrhhumhdqohhsrdhorhhg X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 11 Feb 2025 12:27:39 -0500 (EST) Received: by sf.qyliss.net (Postfix, from userid 1000) id C5A703695706; Tue, 11 Feb 2025 18:27:37 +0100 (CET) From: Alyssa Ross To: "Dom (shymega) Rodriguez" , Samy Lahfa Subject: Re: [PATCH v2] img/app: add dejavu_fonts pkg and fontconfig file In-Reply-To: References: <20250208133634.1963410-1-samy+spectrum@lahfa.xyz> Date: Tue, 11 Feb 2025 18:27:35 +0100 Message-ID: <871pw4gznc.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: HDY2D4FY4KFCVUSYC4IOUXKEGBVN253C X-Message-ID-Hash: HDY2D4FY4KFCVUSYC4IOUXKEGBVN253C X-MailFrom: hi@alyssa.is 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: 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: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable "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 =3D \ >> etc/dbus-1/session.conf \ >>+ etc/fonts/fonts.conf \ >> etc/fstab \ >> etc/init \ >> etc/mdev.conf \ >>@@ -52,6 +53,7 @@ VM_FILES =3D \ >> etc/s6-linux-init/scripts/rc.shutdown \ >> etc/s6-linux-init/scripts/rc.shutdown.final \ >> etc/xdg/xdg-desktop-portal/portals.conf >>+ >> VM_DIRS =3D dev run proc sys tmp \ >> etc/s6-linux-init/run-image/service >> VM_FIFOS =3D 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. >> >>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 =E2=80=94 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. >>+ >>+ >>+ >>+ monospace >>+ >>+ DejaVu Sans Mono >>+ >>+ >>+ >>+ >>+ sans-serif >>+ >>+ DejaVu Sans >>+ >>+ >>+ >>+ /usr/share/fonts >>+ >>--=20 >>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. Samy, both of the remaining issues here (the list sorting, and the patch description) are pretty trivial =E2=80=94 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? Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRV/neXydHjZma5XLJbRZGEIw/wogUCZ6uIhwAKCRBbRZGEIw/w opQbAP9SXmzeIcoMwyCTZCNdMji1DwnfFzIo/+CCjXBKotZVzQD+NEgyVmy21YD4 ythIWuJogHL+g3dRUKlqS2UIZS7aOAo= =kdLS -----END PGP SIGNATURE----- --=-=-=--