719bbcc15e
* doc/guix.texi: Update copyright name for Liliana Marie Prikler. * gnu/packages/build-tools.scm: Update copyright name and email for Liliana Marie Prikler. * gnu/packages/convmv.scm: Likewise. * gnu/packages/emacs-xyz.scm: Likewise. * gnu/packages/emacs.scm: Likewise. * gnu/packages/esolangs.scm: Likewise. * gnu/packages/game-development.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gnome-xyz.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/gstreamer.scm: Likewise. * gnu/packages/guile-xyz.scm: Likewise. * gnu/packages/minetest.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/patches/minetest-add-MINETEST_MOD_PATH.patch: Likewise. * gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: Likewise. * gnu/packages/patches/webkitgtk-bind-all-fonts.patch: Likewise. * gnu/packages/python-xyz.scm: Likewise. * gnu/packages/unicode.scm: Likewise. * gnu/packages/xorg.scm: Likewise. * gnu/services/sound.scm: Likewise. * guix/build-system/renpy.scm: Likewise. * guix/build/emacs-utils.scm: Likewise. * guix/build/renpy-build-system.scm: Likewise.
27 lines
1.3 KiB
Diff
27 lines
1.3 KiB
Diff
Add fonts from all XDG_DATA_DIRS, not just XDG_DATA_HOME.
|
|
|
|
See <http://bugs.gnu.org/41174>.
|
|
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
|
|
Index: webkitgtk-2.28.2/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
|
===================================================================
|
|
--- a/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
|
+++ b/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp
|
|
@@ -387,6 +387,7 @@ static void bindFonts(Vector<CString>& args)
|
|
const char* homeDir = g_get_home_dir();
|
|
const char* dataDir = g_get_user_data_dir();
|
|
const char* cacheDir = g_get_user_cache_dir();
|
|
+ const char* const * dataDirs = g_get_system_data_dirs();
|
|
|
|
// Configs can include custom dirs but then we have to parse them...
|
|
GUniquePtr<char> fontConfig(g_build_filename(configDir, "fontconfig", nullptr));
|
|
@@ -403,6 +404,10 @@ static void bindFonts(Vector<CString>& args)
|
|
bindIfExists(args, fontHomeConfigDir.get());
|
|
bindIfExists(args, fontData.get());
|
|
bindIfExists(args, fontHomeData.get());
|
|
+ for (auto dataDir = dataDirs; dataDir != nullptr && *dataDir != nullptr; dataDir++) {
|
|
+ GUniquePtr<char> fontDataDir(g_build_filename(*dataDir, "fonts", nullptr));
|
|
+ bindIfExists(args, fontDataDir.get());
|
|
+ }
|
|
bindIfExists(args, "/var/cache/fontconfig"); // Used by Debian.
|
|
}
|