Back out ntdll-futex-condition-var patchset

https://bugs.winehq.org/show_bug.cgi?id=45558

3 files changed, 84 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5d04a04a0264..9ac3bef90f6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wine-staging-lol
 	pkgdesc = A compatibility layer for running Windows programs - Staging branch with LoL fixes
 	pkgver = 3.13
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.wine-staging.com
 	install = wine.install
 	arch = x86_64
@@ -145,6 +145,7 @@ pkgbase = wine-staging-lol
 	source = wine-staging-g1de1a96f1e0dca5d012c807b4719b2f03b5f71c9.tar.gz::https://github.com/wine-staging/wine-staging/archive/1de1a96f1e0dca5d012c807b4719b2f03b5f71c9.tar.gz
 	source = wine-staging-lol-patchset-v1.zip::https://bugs.winehq.org/attachment.cgi?id=61944
 	source = wine-staging-lol-8.15-crash-fix.diff::https://bugs.winehq.org/attachment.cgi?id=61968
+	source = wine-staging-back-out-ntdll-futex-condition-var.diff
 	source = harmony-fix.diff
 	source = 30-win32-aliases.conf
 	source = wine-binfmt.conf
@@ -155,6 +156,7 @@ pkgbase = wine-staging-lol
 	sha512sums = e477dd6d152f6f2802dd041427be1a7407616d69c7d9e9d6397bac7498ac3473d15e468750996e4796dac17c87be585be607fff91d7fc49313e4b9adcfd25488
 	sha512sums = 45e29d664787c5a820902f99daef63c78f07c8c01c19ac9e9e720e471322571e46792db2d073d3a461c7f48df71c383065a366a8b746629a5c6f70b215cddac6
 	sha512sums = d53304d7352480fa66d116f9c38cab58e502bf0e4a65f375cea603301e88027308dbe734768460f212f44dba4979db0ff6871a6dccfa9fe032cd67264acdbd25
+	sha512sums = 526506092178fbeae16b6a0c2838a188a5451987f86e2bb8b2cd8e56a2a925164389f88361858747dcd7c32cec73161e5a88a9a8d51dba68b64db73d21207cdc
 	sha512sums = b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e
 	sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
 	sha512sums = bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285
diff --git a/PKGBUILD b/PKGBUILD
index 9027f43169be..2e186b2ea68c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,12 @@
 # Some documentation:
 # Bug with "patchset v1": https://bugs.winehq.org/show_bug.cgi?id=45327
 # Bug with "Version 8.15 fix": https://bugs.winehq.org/show_bug.cgi?id=45550
+# Bug with ntdll-futex problems: https://bugs.winehq.org/show_bug.cgi?id=45558
 
 pkgname=wine-staging-lol
 pkgver=3.13
 _wsgitver=1de1a96f1e0dca5d012c807b4719b2f03b5f71c9
-pkgrel=2
+pkgrel=3
 
 _pkgbasever=${pkgver/rc/-rc}
 
@@ -21,6 +22,7 @@ source=(https://dl.winehq.org/wine/source/3.x/wine-$_pkgbasever.tar.xz{,.sign}
         "wine-staging-g$_wsgitver.tar.gz::https://github.com/wine-staging/wine-staging/archive/$_wsgitver.tar.gz"
         "wine-staging-lol-patchset-v1.zip::https://bugs.winehq.org/attachment.cgi?id=61944"
         "wine-staging-lol-8.15-crash-fix.diff::https://bugs.winehq.org/attachment.cgi?id=61968"
+        "wine-staging-back-out-ntdll-futex-condition-var.diff"
         harmony-fix.diff
         30-win32-aliases.conf
         wine-binfmt.conf)
@@ -29,6 +31,7 @@ sha512sums=('a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50
             'e477dd6d152f6f2802dd041427be1a7407616d69c7d9e9d6397bac7498ac3473d15e468750996e4796dac17c87be585be607fff91d7fc49313e4b9adcfd25488'
             '45e29d664787c5a820902f99daef63c78f07c8c01c19ac9e9e720e471322571e46792db2d073d3a461c7f48df71c383065a366a8b746629a5c6f70b215cddac6'
             'd53304d7352480fa66d116f9c38cab58e502bf0e4a65f375cea603301e88027308dbe734768460f212f44dba4979db0ff6871a6dccfa9fe032cd67264acdbd25'
+            '526506092178fbeae16b6a0c2838a188a5451987f86e2bb8b2cd8e56a2a925164389f88361858747dcd7c32cec73161e5a88a9a8d51dba68b64db73d21207cdc'
             'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
             'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
@@ -122,6 +125,9 @@ prepare() {
   # Allow ccache to work
   mv wine-$_pkgbasever $pkgname
 
+  # LOL Patches wine-staging
+  patch -d wine-staging-$_wsgitver -p1 -i "$srcdir/wine-staging-back-out-ntdll-futex-condition-var.diff"
+
   # apply wine-staging patchset
   pushd wine-staging-$_wsgitver/patches
   ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all
@@ -133,7 +139,7 @@ prepare() {
 
   patch -d $pkgname -Np1 < harmony-fix.diff
 
-  # LOL Patches
+  # LOL Patches wine (after wine-staging patching)
   patch -d $pkgname -p1 -i "$srcdir/0003-Pretend-to-have-a-wow64-dll.patch"
   patch -d $pkgname -p1 -i "$srcdir/0006-Refactor-LdrInitializeThunk.patch"
   patch -d $pkgname -p1 -i "$srcdir/0007-Refactor-RtlCreateUserThread-into-NtCreateThreadEx.patch"
diff --git a/wine-staging-back-out-ntdll-futex-condition-var.diff b/wine-staging-back-out-ntdll-futex-condition-var.diff
new file mode 100644
index 000000000000..188d1b871753
--- /dev/null
+++ b/wine-staging-back-out-ntdll-futex-condition-var.diff
@@ -0,0 +1,73 @@
+diff -U 8 -pr a/patches/patchinstall.sh b/patches/patchinstall.sh
+--- a/patches/patchinstall.sh	2018-07-30 10:09:31.000000000 +0200
++++ b/patches/patchinstall.sh	2018-08-05 11:32:52.466918627 +0200
+@@ -245,17 +245,16 @@ patch_enable_all ()
+ 	enable_ntdll_SystemInterruptInformation="$1"
+ 	enable_ntdll_SystemRoot_Symlink="$1"
+ 	enable_ntdll_ThreadTime="$1"
+ 	enable_ntdll_Threading="$1"
+ 	enable_ntdll_User_Shared_Data="$1"
+ 	enable_ntdll_WRITECOPY="$1"
+ 	enable_ntdll_Wait_User_APC="$1"
+ 	enable_ntdll_Zero_mod_name="$1"
+-	enable_ntdll_futex_condition_var="$1"
+ 	enable_ntdll_set_full_cpu_context="$1"
+ 	enable_ntoskrnl_Stubs="$1"
+ 	enable_nvapi_Stub_DLL="$1"
+ 	enable_nvcuda_CUDA_Support="$1"
+ 	enable_nvcuvid_CUDA_Video_Support="$1"
+ 	enable_nvencodeapi_Video_Encoder="$1"
+ 	enable_ole32_HGLOBALStream="$1"
+ 	enable_ole32_STGPROP="$1"
+@@ -922,19 +921,16 @@ patch_enable ()
+ 			enable_ntdll_WRITECOPY="$2"
+ 			;;
+ 		ntdll-Wait_User_APC)
+ 			enable_ntdll_Wait_User_APC="$2"
+ 			;;
+ 		ntdll-Zero_mod_name)
+ 			enable_ntdll_Zero_mod_name="$2"
+ 			;;
+-		ntdll-futex-condition-var)
+-			enable_ntdll_futex_condition_var="$2"
+-			;;
+ 		ntdll-set_full_cpu_context)
+ 			enable_ntdll_set_full_cpu_context="$2"
+ 			;;
+ 		ntoskrnl-Stubs)
+ 			enable_ntoskrnl_Stubs="$2"
+ 			;;
+ 		nvapi-Stub_DLL)
+ 			enable_nvapi_Stub_DLL="$2"
+@@ -5449,31 +5445,16 @@ fi
+ # |
+ if test "$enable_ntdll_Zero_mod_name" -eq 1; then
+ 	patch_apply ntdll-Zero_mod_name/0001-ntdll-Initialize-mod_name-to-zero.patch
+ 	(
+ 		printf '%s\n' '+    { "Qian Hong", "ntdll: Initialize mod_name to zero.", 1 },';
+ 	) >> "$patchlist"
+ fi
+ 
+-# Patchset ntdll-futex-condition-var
+-# |
+-# | This patchset fixes the following Wine bugs:
+-# |   *	[#45524] Add a futex-based implementation of condition variables
+-# |
+-# | Modified files:
+-# |   *	dlls/ntdll/sync.c
+-# |
+-if test "$enable_ntdll_futex_condition_var" -eq 1; then
+-	patch_apply ntdll-futex-condition-var/0001-ntdll-Add-a-futex-based-condition-variable-implement.patch
+-	(
+-		printf '%s\n' '+    { "Zebediah Figura", "ntdll: Add a futex-based condition variable implementation.", 1 },';
+-	) >> "$patchlist"
+-fi
+-
+ # Patchset ntdll-set_full_cpu_context
+ # |
+ # | Modified files:
+ # |   *	dlls/ntdll/signal_i386.c
+ # |
+ if test "$enable_ntdll_set_full_cpu_context" -eq 1; then
+ 	patch_apply ntdll-set_full_cpu_context/0001-ntdll-Add-back-SS-segment-prefixes-in-set_full_cpu_c.patch
+ 	(