From f38c68b43b1c30e7d288bc3eba596501b11e14ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 13 Dec 2021 10:54:03 +0100
Subject: [PATCH] Update wine to proton_7.0-dev.

---
 build/makefile_base.mak |  1 -
 default_pfx.py          |  6 ++----
 proton                  | 13 +++++++++++--
 wine                    |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index 0c3de163..b0d22a0a 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -669,7 +669,6 @@ WINE_SOURCE_ARGS = \
 
 WINE_CONFIGURE_ARGS = \
   --with-mingw \
-  --without-xpresent \
   --disable-tests
 
 WINE_CONFIGURE_ARGS64 = --enable-win64
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 9e4ee5c6..3195bcb2 100755
--- a/proton
+++ b/proton
@@ -30,7 +30,7 @@ from random import randrange
 #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py"
 #and edit it if needed.
 
-CURRENT_PREFIX_VERSION="6.3-3"
+CURRENT_PREFIX_VERSION="7.0-100"
 
 PFX="Proton: "
 ld_path_var = "LD_LIBRARY_PATH"
@@ -57,7 +57,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):
diff --git a/wine b/wine
index cea3e779..27c9176f 160000
--- a/wine
+++ b/wine
@@ -1 +1 @@
-Subproject commit cea3e779fb907915c55955140931633c7e9989c3
+Subproject commit 27c9176fe348fcf05f972f72df331c967b32adb4