[11_31] Fix local installed font detection on Linux

XmacsLabs · May 13, 2024 · 9e94698 · 9e94698
1 parent a550c16
commit 9e94698
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Plugins/Freetype/tt_file.cpp b/src/Plugins/Freetype/tt_file.cpp
@@ -139,6 +139,9 @@ tt_font_search_path () {
     if (exists (url_system ("$HOME/.local/share/fonts"))) {
       ret= ret | url_system ("$HOME/.local/share/fonts");
     }
+    if (exists (url_system ("$HOME/.fonts"))) {
+      ret= ret | url_system ("$HOME/.fonts");
+    }
 #endif
     ret= ret | url ("/usr/share/texlive/texmf-dist/fonts/opentype") |
          url ("/usr/share/texlive/texmf-dist/fonts/truetype");

diff --git a/xmake.lua b/xmake.lua
@@ -173,7 +173,7 @@ add_configfiles("src/System/config.h.xmake", {
         NOMINMAX = is_plat("windows"),
         MACOSX_EXTENSIONS = is_plat("macosx"),
         SIZEOF_VOID_P = 8,
-        USE_FONTCONFIG = is_plat("linux") and (not linuxos.name() == "uos"),
+        USE_FONTCONFIG = is_plat("linux"),
         USE_STACK_TRACE = (not is_plat("wasm")) and (not is_plat("windows")),
         USE_PLUGIN_GS = not is_plat("wasm"),
         USE_PLUGIN_GIT = not is_plat("wasm"),