From 8398ebded4e3e7b7aeb2bdde5703c7b444b126cc Mon Sep 17 00:00:00 2001
From: Andrew Eikum <aeikum@codeweavers.com>
Date: Wed, 3 Mar 2021 12:18:05 -0600
Subject: [PATCH] update wine to 6.3

---
 build/makefile_base.mak                   | 10 ++++------
 lsteamclient/steamclient_main.c           |  1 -
 proton                                    |  3 +--
 vrclient_x64/vrclient_x64/vrclient_main.c |  1 -
 wine                                      |  2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/build/makefile_base.mak b/build/makefile_base.mak
index 91f8673c..474d7cfe 100644
--- a/build/makefile_base.mak
+++ b/build/makefile_base.mak
@@ -173,11 +173,11 @@ COMPAT_MANIFEST_TEMPLATE := $(SRCDIR)/compatibilitytool.vdf.template
 LICENSE := $(SRCDIR)/dist.LICENSE
 OFL_LICENSE := $(SRCDIR)/fonts/liberation-fonts/LICENSE
 
-GECKO_VER := 2.47.1
-GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.bz2
-GECKO64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.bz2
+GECKO_VER := 2.47.2
+GECKO32_TARBALL := wine-gecko-$(GECKO_VER)-x86.tar.xz
+GECKO64_TARBALL := wine-gecko-$(GECKO_VER)-x86_64.tar.xz
 
-WINEMONO_VER := 5.1.1
+WINEMONO_VER := 6.1.1
 WINEMONO_TARBALL := wine-mono-$(WINEMONO_VER)-x86.tar.xz
 
 GST_ORC := $(SRCDIR)/gst-orc
@@ -1227,7 +1227,6 @@ $(WINE_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL)
 $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 jxrlib64 gst_base64 $(WINE_OBJ64)
 	cd $(dir $@) && \
 		../$(WINE)/configure \
-			--without-curses \
 			--enable-win64 \
 			--disable-tests \
 			--prefix=$(abspath $(DST_DIR)) \
@@ -1248,7 +1247,6 @@ $(WINE_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL)
 $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 jxrlib32 gst_base32 $(WINE_OBJ32)
 	cd $(dir $@) && \
 		../$(WINE)/configure \
-			--without-curses \
 			--disable-tests \
 			--prefix=$(abspath $(WINE_DST32)) \
 			LD_LIBRARY_PATH=$(abspath $(TOOLS_DIR32))/lib \
diff --git a/lsteamclient/steamclient_main.c b/lsteamclient/steamclient_main.c
index c4df70fe..26efcbcc 100644
--- a/lsteamclient/steamclient_main.c
+++ b/lsteamclient/steamclient_main.c
@@ -10,7 +10,6 @@
 #include "winnls.h"
 #include "winuser.h"
 #include "wine/debug.h"
-#include "wine/library.h"
 #include "wine/list.h"
 #include "steam_defs.h"
 
diff --git a/proton b/proton
index db60a04d..95a18d49 100755
--- a/proton
+++ b/proton
@@ -20,7 +20,7 @@ from filelock import FileLock
 #To enable debug logging, copy "user_settings.sample.py" to "user_settings.py"
 #and edit it if needed.
 
-CURRENT_PREFIX_VERSION="5.13-1"
+CURRENT_PREFIX_VERSION="6.3-1"
 
 PFX="Proton: "
 ld_path_var = "LD_LIBRARY_PATH"
@@ -606,7 +606,6 @@ class Session:
         self.dlloverrides = {
                 "steam.exe": "b", #always use our special built-in steam.exe
                 "dotnetfx35.exe": "b", #replace the broken installer, as does Windows
-                "mfplay": "n" #disable built-in mfplay
         }
 
         self.compat_config = set()
diff --git a/vrclient_x64/vrclient_x64/vrclient_main.c b/vrclient_x64/vrclient_x64/vrclient_main.c
index d3e0a20e..eac733e1 100644
--- a/vrclient_x64/vrclient_x64/vrclient_main.c
+++ b/vrclient_x64/vrclient_x64/vrclient_main.c
@@ -9,7 +9,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "wine/debug.h"
-#include "wine/library.h"
 
 #include "vrclient_defs.h"
 #include "vrclient_private.h"
diff --git a/wine b/wine
index c14054e6..3da025c3 160000
--- a/wine
+++ b/wine
@@ -1 +1 @@
-Subproject commit c14054e6923c3cbb4163c24ce41fcf2d0815e84b
+Subproject commit 3da025c3b623c415f61e3200c4ec77554e1ab7d7