Title: [273238] trunk/Tools
- Revision
- 273238
- Author
- [email protected]
- Date
- 2021-02-22 04:20:16 -0800 (Mon, 22 Feb 2021)
Log Message
[Flatpak SDK] X11 SSH forwarding fails
https://bugs.webkit.org/show_bug.cgi?id=222246
Reviewed by Žan Doberšek.
* flatpak/flatpakutils.py:
(WebkitFlatpak.run_in_sandbox): Forward the DISPLAY env var to the sandbox.
* flatpak/webkit-bwrap: Set the DISPLAY env var if it was set in the parent process.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (273237 => 273238)
--- trunk/Tools/ChangeLog 2021-02-22 11:39:10 UTC (rev 273237)
+++ trunk/Tools/ChangeLog 2021-02-22 12:20:16 UTC (rev 273238)
@@ -1,3 +1,14 @@
+2021-02-22 Philippe Normand <[email protected]>
+
+ [Flatpak SDK] X11 SSH forwarding fails
+ https://bugs.webkit.org/show_bug.cgi?id=222246
+
+ Reviewed by Žan Doberšek.
+
+ * flatpak/flatpakutils.py:
+ (WebkitFlatpak.run_in_sandbox): Forward the DISPLAY env var to the sandbox.
+ * flatpak/webkit-bwrap: Set the DISPLAY env var if it was set in the parent process.
+
2021-02-22 Carlos Garcia Campos <[email protected]>
[SOUP] Add support for libsoup3
Modified: trunk/Tools/flatpak/flatpakutils.py (273237 => 273238)
--- trunk/Tools/flatpak/flatpakutils.py 2021-02-22 11:39:10 UTC (rev 273237)
+++ trunk/Tools/flatpak/flatpakutils.py 2021-02-22 12:20:16 UTC (rev 273238)
@@ -890,6 +890,10 @@
"WEBKIT_FLATPAK_USER_DIR": os.environ["FLATPAK_USER_DIR"],
})
+ display = os.environ.get("DISPLAY")
+ if display:
+ flatpak_env["WEBKIT_FLATPAK_DISPLAY"] = display
+
try:
return self.execute_command(flatpak_command, stdout=stdout, env=flatpak_env)
except KeyboardInterrupt:
Modified: trunk/Tools/flatpak/webkit-bwrap (273237 => 273238)
--- trunk/Tools/flatpak/webkit-bwrap 2021-02-22 11:39:10 UTC (rev 273237)
+++ trunk/Tools/flatpak/webkit-bwrap 2021-02-22 12:20:16 UTC (rev 273238)
@@ -100,6 +100,10 @@
for dst, src in try_bind_mounts.items():
bwrap_args.extend(("--bind-try", src, dst))
+ display = environ.get("WEBKIT_FLATPAK_DISPLAY")
+ if display:
+ bwrap_args.extend(("--setenv", "DISPLAY", display))
+
for env in environ.keys():
if env.startswith("LC_") or env == "LANGUAGE":
bwrap_args.extend(("--unsetenv", env))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
