Add fix for 8.15 crash

https://bugs.winehq.org/show_bug.cgi?id=45550#c8

2 files changed, 16 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9dc023b5838b..5d04a04a0264 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wine-staging-lol
-	pkgdesc = A compatibility layer for running Windows programs - Staging branch
+	pkgdesc = A compatibility layer for running Windows programs - Staging branch with LoL fixes
 	pkgver = 3.13
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.wine-staging.com
 	install = wine.install
 	arch = x86_64
@@ -142,8 +142,9 @@ pkgbase = wine-staging-lol
 	options = staticlibs
 	source = https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz
 	source = https://dl.winehq.org/wine/source/3.x/wine-3.13.tar.xz.sign
-	source = wine-staging-v3.13.tar.gz::https://github.com/wine-staging/wine-staging/archive/1de1a96f1e0dca5d012c807b4719b2f03b5f71c9.tar.gz
+	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 = harmony-fix.diff
 	source = 30-win32-aliases.conf
 	source = wine-binfmt.conf
@@ -153,6 +154,7 @@ pkgbase = wine-staging-lol
 	sha512sums = SKIP
 	sha512sums = e477dd6d152f6f2802dd041427be1a7407616d69c7d9e9d6397bac7498ac3473d15e468750996e4796dac17c87be585be607fff91d7fc49313e4b9adcfd25488
 	sha512sums = 45e29d664787c5a820902f99daef63c78f07c8c01c19ac9e9e720e471322571e46792db2d073d3a461c7f48df71c383065a366a8b746629a5c6f70b215cddac6
+	sha512sums = d53304d7352480fa66d116f9c38cab58e502bf0e4a65f375cea603301e88027308dbe734768460f212f44dba4979db0ff6871a6dccfa9fe032cd67264acdbd25
 	sha512sums = b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e
 	sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
 	sha512sums = bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285
diff --git a/PKGBUILD b/PKGBUILD
index 10ed8642f64b..9027f43169be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,23 @@
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Manuel Reimer <manuel.reimer@gmx.de>
+
+# 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
 
 pkgname=wine-staging-lol
 pkgver=3.13
 _wsgitver=1de1a96f1e0dca5d012c807b4719b2f03b5f71c9
-pkgrel=1
+pkgrel=2
 
 _pkgbasever=${pkgver/rc/-rc}
 
 source=(https://dl.winehq.org/wine/source/3.x/wine-$_pkgbasever.tar.xz{,.sign}
-        "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/$_wsgitver.tar.gz"
+        "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"
         harmony-fix.diff
         30-win32-aliases.conf
         wine-binfmt.conf)
@@ -22,13 +28,14 @@ sha512sums=('a07a3d2a19261f9251f165ca4c14871e6ebda4d3f99da16f9fc41f06e80cae3fb50
             'SKIP'
             'e477dd6d152f6f2802dd041427be1a7407616d69c7d9e9d6397bac7498ac3473d15e468750996e4796dac17c87be585be607fff91d7fc49313e4b9adcfd25488'
             '45e29d664787c5a820902f99daef63c78f07c8c01c19ac9e9e720e471322571e46792db2d073d3a461c7f48df71c383065a366a8b746629a5c6f70b215cddac6'
+            'd53304d7352480fa66d116f9c38cab58e502bf0e4a65f375cea603301e88027308dbe734768460f212f44dba4979db0ff6871a6dccfa9fe032cd67264acdbd25'
             'b86edf07bfc560f403fdfd5a71f97930ee2a4c3f76c92cc1a0dbb2e107be9db3bed3a727a0430d8a049583c63dd11f5d4567fb7aa69b193997c6da241acc4f2e'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
             'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
 validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
               DA23579A74D4AD9AF9D3F945CEFAC8EAAF17519D)
 
-pkgdesc="A compatibility layer for running Windows programs - Staging branch"
+pkgdesc="A compatibility layer for running Windows programs - Staging branch with LoL fixes"
 url="http://www.wine-staging.com"
 arch=(x86_64)
 options=(staticlibs)
@@ -131,6 +138,7 @@ prepare() {
   patch -d $pkgname -p1 -i "$srcdir/0006-Refactor-LdrInitializeThunk.patch"
   patch -d $pkgname -p1 -i "$srcdir/0007-Refactor-RtlCreateUserThread-into-NtCreateThreadEx.patch"
   patch -d $pkgname -p1 -i "$srcdir/0009-Refactor-__wine_syscall_dispatcher-for-i386.patch"
+  patch -d $pkgname -p1 -i "$srcdir/wine-staging-lol-8.15-crash-fix.diff"
 
   sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure*