From 8371a0b86ae6367c75e279eedfc39cbfa56245f3 Mon Sep 17 00:00:00 2001 From: Jeremy Huntwork Date: Mon, 24 Aug 2026 00:51:34 -0400 Subject: [PATCH 1/4] Build Fontconfig caches with active fonts --- recipes/desktop/fontconfig/recipe.kdl | 38 ++++++++++++++++++++------- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/recipes/desktop/fontconfig/recipe.kdl b/recipes/desktop/fontconfig/recipe.kdl index c2aaa07e..108ef90a 100644 --- a/recipes/desktop/fontconfig/recipe.kdl +++ b/recipes/desktop/fontconfig/recipe.kdl @@ -1,20 +1,25 @@ recipe { name "fontconfig" version "2.16.0" - release 1 + release 2 description "Library for configuring and customizing font access" url "https://www.freedesktop.org/wiki/Software/fontconfig/" archs "aarch64" "x86_64" licenses "MIT" - depends "expat-dev" \ + depends "autoconf" \ + "automake" \ + "expat-dev" \ "freetype" \ "freetype-dev" \ + "gettext" \ "gperf" \ "harfbuzz" \ "harfbuzz-dev" \ "libpng" \ "libpng-dev" \ + "libtool" \ "llvm" \ + "m4" \ "make" \ "mimalloc-dev" \ "musl-dev" \ @@ -23,13 +28,13 @@ recipe { "zlib-ng-dev" } -source "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${recipe.version}.tar.xz" { - blake3 "5c95d48f5b9150f4a06d8acac12c25edaac956007df95a3bf527df02a5908f0e" +source "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/${recipe.version}/fontconfig-${recipe.version}.tar.bz2" { + blake3 "17169c95523bfc283367f6a8099db3d9938ca66fd698c51fb027dc9f29b0da2e" } build { script r#" - ./configure \ + ./autogen.sh \ --prefix=/usr \ --enable-shared \ --enable-static \ @@ -42,6 +47,17 @@ build { install { script r#" make DESTDIR="${DESTDIR}" install + rm -rf "${DESTDIR}/var/cache/fontconfig" + + mkdir -p "${DESTDIR}/etc/fonts/conf.d" \ + "${DESTDIR}/usr/lib/fontconfig/cache" + cat > "${DESTDIR}/etc/fonts/conf.d/00-mere-cache.conf" <<'EOF' + + + + /usr/lib/fontconfig/cache + +EOF "# } @@ -49,15 +65,19 @@ package "fontconfig" { files "etc/fonts/" \ "usr/bin/" \ "usr/lib/lib*.so*" \ + "usr/lib/fontconfig/" \ "usr/share/fontconfig/" \ - "usr/share/man/man1/" \ - "usr/share/man/man5/" \ + "usr/share/gettext/its/" \ "usr/share/xml/" + + realizer "fontconfig-cache" { + inputs "usr/share/fonts/" + command "/usr/bin/fc-cache" "-f" "-s" + } } package "fontconfig-dev" { files "usr/include/" \ "usr/lib/lib*.a" \ - "usr/lib/pkgconfig/" \ - "usr/share/man/man3/" + "usr/lib/pkgconfig/" } From c25761230f1c1d8f92b2d2e68ca4e7df2dbb0bf2 Mon Sep 17 00:00:00 2001 From: Jeremy Huntwork Date: Mon, 24 Aug 2026 00:53:49 -0400 Subject: [PATCH 2/4] Load Fontconfig configuration from profile defaults --- recipes/desktop/fontconfig/recipe.kdl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/desktop/fontconfig/recipe.kdl b/recipes/desktop/fontconfig/recipe.kdl index 108ef90a..af9a800c 100644 --- a/recipes/desktop/fontconfig/recipe.kdl +++ b/recipes/desktop/fontconfig/recipe.kdl @@ -38,7 +38,7 @@ build { --prefix=/usr \ --enable-shared \ --enable-static \ - --sysconfdir=/etc \ + --sysconfdir=/etc-defaults \ --localstatedir=/var make "# @@ -49,9 +49,9 @@ install { make DESTDIR="${DESTDIR}" install rm -rf "${DESTDIR}/var/cache/fontconfig" - mkdir -p "${DESTDIR}/etc/fonts/conf.d" \ + mkdir -p "${DESTDIR}/etc-defaults/fonts/conf.d" \ "${DESTDIR}/usr/lib/fontconfig/cache" - cat > "${DESTDIR}/etc/fonts/conf.d/00-mere-cache.conf" <<'EOF' + cat > "${DESTDIR}/etc-defaults/fonts/conf.d/00-mere-cache.conf" <<'EOF' @@ -62,7 +62,7 @@ EOF } package "fontconfig" { - files "etc/fonts/" \ + files "etc-defaults/fonts/" \ "usr/bin/" \ "usr/lib/lib*.so*" \ "usr/lib/fontconfig/" \ From b88cc5d6fec09b1b1a67115313941870ac0460f9 Mon Sep 17 00:00:00 2001 From: Jeremy Huntwork Date: Mon, 24 Aug 2026 00:54:45 -0400 Subject: [PATCH 3/4] Load Fontconfig configuration from profile defaults --- recipes/desktop/fontconfig/recipe.kdl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/desktop/fontconfig/recipe.kdl b/recipes/desktop/fontconfig/recipe.kdl index af9a800c..5e87cb9c 100644 --- a/recipes/desktop/fontconfig/recipe.kdl +++ b/recipes/desktop/fontconfig/recipe.kdl @@ -1,7 +1,7 @@ recipe { name "fontconfig" version "2.16.0" - release 2 + release 3 description "Library for configuring and customizing font access" url "https://www.freedesktop.org/wiki/Software/fontconfig/" archs "aarch64" "x86_64" From 96cfc0e8be362388af86075d99e4ef7228512df1 Mon Sep 17 00:00:00 2001 From: Jeremy Huntwork Date: Mon, 24 Aug 2026 00:57:14 -0400 Subject: [PATCH 4/4] Keep Fontconfig cache path in profiles --- recipes/desktop/fontconfig/recipe.kdl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/desktop/fontconfig/recipe.kdl b/recipes/desktop/fontconfig/recipe.kdl index 5e87cb9c..04f46a01 100644 --- a/recipes/desktop/fontconfig/recipe.kdl +++ b/recipes/desktop/fontconfig/recipe.kdl @@ -1,7 +1,7 @@ recipe { name "fontconfig" version "2.16.0" - release 3 + release 4 description "Library for configuring and customizing font access" url "https://www.freedesktop.org/wiki/Software/fontconfig/" archs "aarch64" "x86_64" @@ -51,6 +51,7 @@ install { mkdir -p "${DESTDIR}/etc-defaults/fonts/conf.d" \ "${DESTDIR}/usr/lib/fontconfig/cache" + touch "${DESTDIR}/usr/lib/fontconfig/cache/.keep" cat > "${DESTDIR}/etc-defaults/fonts/conf.d/00-mere-cache.conf" <<'EOF'