From 8686361974aad6346c172f1dd158b4165334c498 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mar 18 2023 06:53:05 +0000
Subject: Add 05-flatpak-fontpath.conf


We need a different MD5 for fontconfig cache to avoid
conflict between caches on host and flatpak.

See https://github.com/fedora-silverblue/issue-tracker/issues/305

---

diff --git a/05-flatpak-fontpath.conf b/05-flatpak-fontpath.conf
new file mode 100644
index 0000000..8e55a40
--- /dev/null
+++ b/05-flatpak-fontpath.conf
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+        <!-- Redefine font directories to generate caches with different id -->
+        <reset-dirs />
+        <dir salt="flatpak">/usr/share/fonts</dir>
+        <dir salt="flatpak">/usr/share/X11/fonts/Type1</dir>
+        <dir salt="flatpak">/usr/share/X11/fonts/TTF</dir>
+        <dir salt="flatpak">/usr/local/share/fonts</dir>
+        <dir prefix="xdg">fonts</dir>
+        <dir>~/.fonts</dir>
+</fontconfig>
diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index b14e2bb..f4e94bb 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -15,6 +15,7 @@ Source6:        org.fedoraproject.KDE5Platform.appdata.xml
 Source7:        org.fedoraproject.KDE5Sdk.appdata.xml
 Source8:        org.fedoraproject.KDE6Platform.appdata.xml
 Source9:        org.fedoraproject.KDE6Sdk.appdata.xml
+Source10:       05-flatpak-fontpath.conf
 
 License:        MIT
 
@@ -45,6 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/cache/fontconfig
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d
 install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE1}
+install -t $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d -p -m 0644 %{SOURCE10}
 
 # usercustomize.py to set up Python paths
 for d in %{python3_sitelib} ; do