Title: [290395] trunk/Source/WebKit
- Revision
- 290395
- Author
- [email protected]
- Date
- 2022-02-23 15:47:27 -0800 (Wed, 23 Feb 2022)
Log Message
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 <[email protected]> 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: trunk/Source/WebKit/ChangeLog (290394 => 290395)
--- trunk/Source/WebKit/ChangeLog 2022-02-23 23:18:34 UTC (rev 290394)
+++ trunk/Source/WebKit/ChangeLog 2022-02-23 23:47:27 UTC (rev 290395)
@@ -1,3 +1,14 @@
+2022-02-23 Liliana Marie Prikler <[email protected]>
+
+ 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-23 Chris Dumez <[email protected]>
Adopt more widely the new URL constructor that takes in a String
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp (290394 => 290395)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2022-02-23 23:18:34 UTC (rev 290394)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp 2022-02-23 23:47:27 UTC (rev 290395)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
