From 05a75ff1612f9c54dbbc2ee5a2cd22d2fa1daa7f Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Tue, 13 May 2025 18:08:31 -0400
Subject: [PATCH] Update fontconfig config

This should stop the noise seen with flatpak-module-tools, as
/run/host/font-dirs.xml exists only when running flatpaks or building with
flatpak-builder, but not when building in mock (which does not involve
running flatpak).

Fontconfig error: Cannot load config file "/run/host/font-dirs.xml": No such file: /run/host/font-dirs.xml
---
 50-flatpak.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/50-flatpak.conf b/50-flatpak.conf
index 336183c..27036d4 100644
--- a/50-flatpak.conf
+++ b/50-flatpak.conf
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- This should be kept in sync with changes to
-     https://gitlab.com/freedesktop-sdk/freedesktop-sdk/blob/master/files/fontconfig-flatpak.conf
+     https://gitlab.com/freedesktop-sdk/freedesktop-sdk/blob/master/files/fontconfig/50-flatpak.conf
      from the Freedesktop runtimes. -->
 <fontconfig>
         <cachedir>/usr/cache/fontconfig</cachedir>
@@ -14,6 +14,7 @@
         <include ignore_missing="yes">/app/etc/fonts/local.conf</include>
 
         <dir>/run/host/fonts</dir>
+        <dir>/run/host/local-fonts</dir>
         <dir>/run/host/user-fonts</dir>
 
         <!-- This is duplicated from the general config because we want to write there
@@ -24,5 +25,6 @@
         <cachedir>/run/host/fonts-cache</cachedir>
         <cachedir>/run/host/user-fonts-cache</cachedir>
 
-        <include>/run/host/font-dirs.xml</include>
+        <!-- This only exists when running flatpaks, not when building them in mock -->
+        <include ignore_missing="yes">/run/host/font-dirs.xml</include>
 </fontconfig>