From ae66c986a92982cc84a2a4f30aa2cebef379d21a Mon Sep 17 00:00:00 2001 From: Proton CI Bot Date: Fri, 24 Apr 2026 16:02:44 +0000 Subject: [PATCH 1/2] experimental-bleeding-edge-11.0-349120-20260424-pbd319b-w8bb4e7-de3d3f6-v004fe3 --- FEX | 2 +- dxvk | 2 +- dxvk-nvapi | 2 +- vkd3d | 2 +- vkd3d-proton | 2 +- wine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FEX b/FEX index 9681559d56e..4b02c04afce 160000 --- a/FEX +++ b/FEX @@ -1 +1 @@ -Subproject commit 9681559d56eee7eff5cd9232ca3b49ba419cb62b +Subproject commit 4b02c04afce5055234e212af206c08abd054375f diff --git a/dxvk b/dxvk index 83e503b4ae6..e3d3f69fe37 160000 --- a/dxvk +++ b/dxvk @@ -1 +1 @@ -Subproject commit 83e503b4ae6de849ed9d2633e76e5dc5fb12119a +Subproject commit e3d3f69fe3707a6c0b6886262d404f5af92b4b33 diff --git a/dxvk-nvapi b/dxvk-nvapi index c68c3507112..efb17dd4355 160000 --- a/dxvk-nvapi +++ b/dxvk-nvapi @@ -1 +1 @@ -Subproject commit c68c35071128c2bda31916c50080c07062f23fe6 +Subproject commit efb17dd43557d497af1f314a677cbf4807d657f5 diff --git a/vkd3d b/vkd3d index 30b93dcea8b..fad7fcf2150 160000 --- a/vkd3d +++ b/vkd3d @@ -1 +1 @@ -Subproject commit 30b93dcea8b0597f7d964fafc907d3e9609a4651 +Subproject commit fad7fcf2150aa04c599e7553549710daeb06c356 diff --git a/vkd3d-proton b/vkd3d-proton index 0103de63b5d..004fe379bd2 160000 --- a/vkd3d-proton +++ b/vkd3d-proton @@ -1 +1 @@ -Subproject commit 0103de63b5d649d2e0947052789723adc893f601 +Subproject commit 004fe379bd2a5b27b1e8d0de22eb5652330cdb11 diff --git a/wine b/wine index 79604fd6795..8bb4e716970 160000 --- a/wine +++ b/wine @@ -1 +1 @@ -Subproject commit 79604fd6795ba6c774c4a3cc2044cab8fb22772e +Subproject commit 8bb4e7169707986385388fd5ec1f50b54dab1a2f From 784afa69f10e702faa79498825d82c7bcf62b9e9 Mon Sep 17 00:00:00 2001 From: "Andrew C. H. McMillan" <30243134+Summertime@users.noreply.github.com> Date: Sat, 25 Apr 2026 04:22:22 +0930 Subject: [PATCH 2/2] proton: undo the effect of PYTHONSAFEPATH if any with PYTHONSAFEPATH enabled: `['/var/lib/...', ...]` becomes `[PROTON_DIR, '/var/lib/...', ...]` without PYTHONSAFEPATH enabled: `[PROTON_DIR, '/var/lib/...', ...]` becomes `[PROTON_DIR, PROTON_DIR, '/var/lib/...', ...]` The double entry should have the same effect as a single entry (enabling relative imports) The relevant pieces in play: https://docs.python.org/3/using/cmdline.html#envvar-PYTHONSAFEPATH https://docs.python.org/3/library/sys.html#sys.path https://docs.python.org/3/reference/datamodel.html#module.__file__ --- proton | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/proton b/proton index 40124a8175e..3bc26d828bb 100755 --- a/proton +++ b/proton @@ -35,6 +35,12 @@ from ctypes import c_void_p from ctypes import c_size_t from ctypes import c_ssize_t +# PYTHONSAFEPATH might be set, so add the script directory to the path for relative imports +try: + sys.path.insert(0, os.path.dirname(os.path.realpath(__file__))) +except NameError: + pass + from filelock import FileLock from random import randrange