From 37d809ff9fa0c77d29a18416fc8ade16f080d375 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 31 Aug 2017 16:09:02 +0200 Subject: [PATCH] run: Always create a fontconfig cache dir in the app dir Otherwise fontconfig falls back to a shared ~/.fontconfig dir which means caches are not per-app, and is not necessarily accessible. (cherry picked from commit fef8743f262ab192edd0086d0c725a40310ec6f0) Closes: #1115 Approved by: alexlarsson --- common/flatpak-run.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/flatpak-run.c b/common/flatpak-run.c index 71b37d8a..2dc8e607 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -3057,6 +3057,7 @@ flatpak_ensure_data_dir (const char *app_id, g_autoptr(GFile) dir = flatpak_get_data_dir (app_id); g_autoptr(GFile) data_dir = g_file_get_child (dir, "data"); g_autoptr(GFile) cache_dir = g_file_get_child (dir, "cache"); + g_autoptr(GFile) fontconfig_cache_dir = g_file_get_child (cache_dir, "fontconfig"); g_autoptr(GFile) tmp_dir = g_file_get_child (cache_dir, "tmp"); g_autoptr(GFile) config_dir = g_file_get_child (dir, "config"); @@ -3066,6 +3067,9 @@ flatpak_ensure_data_dir (const char *app_id, if (!flatpak_mkdir_p (cache_dir, cancellable, error)) return NULL; + if (!flatpak_mkdir_p (fontconfig_cache_dir, cancellable, error)) + return NULL; + if (!flatpak_mkdir_p (tmp_dir, cancellable, error)) return NULL;