From f095fcf18110d386eecdcf103abedb71ba2c07f5 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Thu, 14 May 2026 01:14:12 +0900
Subject: [PATCH] internal/rosa/x: font-util and libfontenc artifact

Required by libXfont2.

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 internal/rosa/all.go |  2 ++
 internal/rosa/x.go   | 72 +++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/internal/rosa/all.go b/internal/rosa/all.go
index 5714c7ba..640d581c 100644
--- a/internal/rosa/all.go
+++ b/internal/rosa/all.go
@@ -56,6 +56,7 @@ const (
 	Fakeroot
 	Findutils
 	Flex
+	FontUtil
 	Freetype
 	Fuse
 	GMP
@@ -92,6 +93,7 @@ const (
 	Libev
 	Libexpat
 	Libffi
+	Libfontenc
 	Libgd
 	Libglvnd
 	Libiconv
diff --git a/internal/rosa/x.go b/internal/rosa/x.go
index 3c583e55..b2526313 100644
--- a/internal/rosa/x.go
+++ b/internal/rosa/x.go
@@ -484,6 +484,73 @@ func init() {
 	}
 }
 
+func (t Toolchain) newFontUtil() (pkg.Artifact, string) {
+	const (
+		version  = "1.4.2"
+		checksum = "YWiaIxkq-N2yNdbGa_RF1S0UkQq6xsgoRT73WZP2DOmyH_CJ0TAkpQjId657MQmh"
+	)
+	return t.NewPackage("font-util", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/font/util",
+		"font-util-"+version,
+		checksum,
+	), nil, &MakeHelper{
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
+	},
+		Automake,
+		Libtool,
+		PkgConfig,
+
+		utilMacros,
+	), version
+}
+
+func init() {
+	artifactsM[FontUtil] = Metadata{
+		f: Toolchain.newFontUtil,
+
+		Name:        "font-util",
+		Description: "X.Org font package creation/installation utilities",
+		Website:     "https://gitlab.freedesktop.org/xorg/font/util",
+
+		ID: 15055,
+	}
+}
+
+func (t Toolchain) newLibfontenc() (pkg.Artifact, string) {
+	const (
+		version  = "1.1.9"
+		checksum = "XqosXfbVwaoYzG9vVyRCl3eatwjASoJdLZsxQ37NN8S_jTyqNmbxpRSJGImJj7RS"
+	)
+	return t.NewPackage("libfontenc", version, newFromGitLab(
+		"gitlab.freedesktop.org",
+		"xorg/lib/libfontenc",
+		"libfontenc-"+version,
+		checksum,
+	), nil, &MakeHelper{
+		Generate: "NOCONFIGURE=1 ./autogen.sh",
+	},
+		Automake,
+		Libtool,
+		PkgConfig,
+
+		utilMacros,
+		FontUtil,
+		XorgProto,
+	), version
+}
+func init() {
+	artifactsM[Libfontenc] = Metadata{
+		f: Toolchain.newLibfontenc,
+
+		Name:        "libfontenc",
+		Description: "X font encoding library",
+		Website:     "https://gitlab.freedesktop.org/xorg/lib/libfontenc",
+
+		ID: 1613,
+	}
+}
+
 func (t Toolchain) newLibxkbfile() (pkg.Artifact, string) {
 	const (
 		version  = "1.2.0"
@@ -495,11 +562,6 @@ func (t Toolchain) newLibxkbfile() (pkg.Artifact, string) {
 		"libxkbfile-"+version,
 		checksum,
 	), nil, (*MesonHelper)(nil),
-		Automake,
-		Libtool,
-		PkgConfig,
-
-		utilMacros,
 		LibX11,
 	), version
 }