32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
From 8e24bfacdc8c29852511b40ae58c63e894d3f679 Mon Sep 17 00:00:00 2001
|
|
From: Tk-Glitch <ti3nou@gmail.com>
|
|
Date: Mon, 3 May 2021 13:29:25 +0200
|
|
Subject: Adapt to new lib paths in wine 6.7-devel
|
|
|
|
|
|
diff --git a/proton b/proton
|
|
index 1375736..4cc8429 100755
|
|
--- a/proton
|
|
+++ b/proton
|
|
@@ -301,7 +305,7 @@ class CompatData:
|
|
def pfx_copy(self, src, dst, dll_copy=False):
|
|
if os.path.islink(src):
|
|
contents = os.readlink(src)
|
|
- if os.path.dirname(contents).endswith(('/lib/wine', '/lib/wine/fakedlls', '/lib64/wine', '/lib64/wine/fakedlls')):
|
|
+ if os.path.dirname(contents).endswith(('/lib/wine/i386-windows', '/lib64/wine/x86_64-windows')):
|
|
# wine builtin dll
|
|
# make the destination an absolute symlink
|
|
contents = os.path.normpath(os.path.join(os.path.dirname(src), contents))
|
|
@@ -625,9 +629,9 @@ class Session:
|
|
# Allow wine to restore this when calling an external app.
|
|
self.env['ORIG_'+ld_path_var] = os.environ.get(ld_path_var, '')
|
|
|
|
- prepend_to_env_str(self.env, ld_path_var, g_proton.lib64_dir + ":" + g_proton.lib_dir, ":")
|
|
+ prepend_to_env_str(self.env, ld_path_var, g_proton.lib64_dir + ":" + g_proton.lib_dir + ":" + g_proton.lib64_dir + "x86_64-unix/:" + g_proton.lib_dir + "i386-unix/", ":")
|
|
|
|
- self.env["WINEDLLPATH"] = g_proton.lib64_dir + "/wine:" + g_proton.lib_dir + "/wine"
|
|
+ self.env["WINEDLLPATH"] = g_proton.lib64_dir + ":" + g_proton.lib_dir
|
|
|
|
prepend_to_env_str(self.env, "PATH", g_proton.bin_dir, ":")
|
|
|