From 8c558d53c23470c443eed58ee99aa1de250550d0 Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Wed, 15 Dec 2021 10:53:45 -0600 Subject: [PATCH] fixup! Update wine to proton_7.0-dev. --- default_pfx.py | 6 ++---- proton | 11 ++++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/default_pfx.py b/default_pfx.py index db413d41..89857366 100755 --- a/default_pfx.py +++ b/default_pfx.py @@ -59,15 +59,13 @@ def setup_dll_symlinks(default_pfx_dir, dist_dir): if os.path.isfile(filename) and file_is_wine_builtin_dll(filename): bitness = dll_bitness(filename) if bitness == 32: - libdir = os.path.join(dist_dir, 'lib/wine') + libdir = os.path.join(dist_dir, 'lib/wine/i386-windows') elif bitness == 64: - libdir = os.path.join(dist_dir, 'lib64/wine') + libdir = os.path.join(dist_dir, 'lib64/wine/x86_64-windows') else: continue if os.path.exists(os.path.join(libdir, file_)): target = os.path.join(libdir, file_) - elif os.path.exists(os.path.join(libdir, 'fakedlls', file_)): - target = os.path.join(libdir, 'fakedlls', file_) else: continue os.unlink(filename) diff --git a/proton b/proton index befc35f4..ec3808d4 100755 --- a/proton +++ b/proton @@ -58,7 +58,16 @@ def log(msg): def file_is_wine_builtin_dll(path): if os.path.islink(path): contents = os.readlink(path) - if os.path.dirname(contents).endswith(('/lib/wine/i386-unix', '/lib/wine/i386-windows', '/lib64/wine/x86_64-unix', '/lib64/wine/x86_64-windows')): + if os.path.dirname(contents).endswith(( + '/lib/wine', + '/lib64/wine', + '/lib/wine/fakedlls', + '/lib64/wine/fakedlls', + '/lib/wine/i386-unix', + '/lib/wine/i386-windows', + '/lib64/wine/x86_64-unix', + '/lib64/wine/x86_64-windows' + )): # This may be a broken link to a dll in a removed Proton install return True if not os.path.exists(path):