Title: [290433] releases/WebKitGTK/webkit-2.36/Source/WebKit
- Revision
- 290433
- Author
- ape...@igalia.com
- Date
- 2022-02-24 08:09:37 -0800 (Thu, 24 Feb 2022)
Log Message
Merge r290395 - Bubblewrap launcher doesn't bind font locations from XDG_DATA_DIRS
https://bugs.webkit.org/show_bug.cgi?id=237089
Patch by Liliana Marie Prikler <liliana.prik...@gmail.com> on 2022-02-23
Reviewed by Michael Catanzaro.
* UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
(WebKit::bindFonts): Expose font directories present in the
XDG_DATA_DIRS environment variable.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog (290432 => 290433)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog 2022-02-24 16:09:32 UTC (rev 290432)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog 2022-02-24 16:09:37 UTC (rev 290433)
@@ -1,3 +1,14 @@
+2022-02-23 Liliana Marie Prikler <liliana.prik...@gmail.com>
+
+ Bubblewrap launcher doesn't bind font locations from XDG_DATA_DIRS
+ https://bugs.webkit.org/show_bug.cgi?id=237089
+
+ Reviewed by Michael Catanzaro.
+
+ * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+ (WebKit::bindFonts): Expose font directories present in the
+ XDG_DATA_DIRS environment variable.
+
2022-02-22 Alexander Kanavin <a...@linutronix.de>
When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (290432 => 290433)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2022-02-24 16:09:32 UTC (rev 290432)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2022-02-24 16:09:37 UTC (rev 290433)
@@ -288,6 +288,7 @@
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));
@@ -304,6 +305,10 @@
bindIfExists(args, fontHomeConfigDir.get());
bindIfExists(args, fontData.get());
bindIfExists(args, fontHomeData.get());
+ for (auto* dataDir = dataDirs; dataDir && *dataDir; dataDir++) {
+ GUniquePtr<char> fontDataDir(g_build_filename(*dataDir, "fonts", nullptr));
+ bindIfExists(args, fontDataDir.get());
+ }
bindIfExists(args, "/var/cache/fontconfig"); // Used by Debian.
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
