Changeset 273238 in webkit


Ignore:
Timestamp:
Feb 22, 2021 4:20:16 AM (3 years ago)
Author:
Philippe Normand
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.
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r273236 r273238  
     12021-02-22  Philippe Normand  <pnormand@igalia.com>
     2
     3        [Flatpak SDK] X11 SSH forwarding fails
     4        https://bugs.webkit.org/show_bug.cgi?id=222246
     5
     6        Reviewed by Žan Doberšek.
     7
     8        * flatpak/flatpakutils.py:
     9        (WebkitFlatpak.run_in_sandbox): Forward the DISPLAY env var to the sandbox.
     10        * flatpak/webkit-bwrap: Set the DISPLAY env var if it was set in the parent process.
     11
    1122021-02-22  Carlos Garcia Campos  <cgarcia@igalia.com>
    213
  • trunk/Tools/flatpak/flatpakutils.py

    r273234 r273238  
    891891        })
    892892
     893        display = os.environ.get("DISPLAY")
     894        if display:
     895            flatpak_env["WEBKIT_FLATPAK_DISPLAY"] = display
     896
    893897        try:
    894898            return self.execute_command(flatpak_command, stdout=stdout, env=flatpak_env)
  • trunk/Tools/flatpak/webkit-bwrap

    r272733 r273238  
    101101        bwrap_args.extend(("--bind-try", src, dst))
    102102
     103    display = environ.get("WEBKIT_FLATPAK_DISPLAY")
     104    if display:
     105        bwrap_args.extend(("--setenv", "DISPLAY", display))
     106
    103107    for env in environ.keys():
    104108        if env.startswith("LC_") or env == "LANGUAGE":
Note: See TracChangeset for help on using the changeset viewer.