Sync from GitHub (https://github.com/M-Reimer/wine-lol/commit/7d9ad61443ea2c666fd0efd19800db1176e960e1)

2 files changed, 23 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b512f277a42..a31e5af514a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.2.1
-# Sat Mar  7 12:57:40 UTC 2020
+# Wed May 20 19:52:32 UTC 2020
 pkgbase = wine-lol
 	pkgdesc = A compatibility layer for running Windows programs - Staging branch with League Of Legends fixes
-	pkgver = 5.3
+	pkgver = 5.6
 	pkgrel = 1
 	url = http://www.wine-staging.com
 	install = wine.install
@@ -151,12 +151,14 @@ pkgbase = wine-lol
 	optdepends = samba
 	optdepends = dosbox
 	options = staticlibs
-	source = https://dl.winehq.org/wine/source/5.x/wine-5.3.tar.xz
-	source = wine-staging-v5.3.tar.gz::https://github.com/wine-staging/wine-staging/archive/v5.3.tar.gz
+	source = https://dl.winehq.org/wine/source/5.x/wine-5.6.tar.xz
+	source = wine-staging-v5.6.tar.gz::https://github.com/wine-staging/wine-staging/archive/v5.6.tar.gz
+	source = https://raw.githubusercontent.com/wine-staging/wine-staging/8d4d0a840e6ce434483edd81acb3be90fd734e44/patches/user32-rawinput-mouse/0005-server-Broadcast-rawinput-message-if-request-flag-is.patch
 	source = 30-win32-aliases.conf
 	source = 420CustomPatch1.diff
-	sha512sums = 40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6
-	sha512sums = df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702
+	sha512sums = b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4
+	sha512sums = 7ddf5699834a6e04b094a7cae008175c874415d22554bac38176f3121b9533071ef610f8b5a0dd3ce3e4adf8a9d4ac214aa1cee7634959c5150b66fbb74710b7
+	sha512sums = 13ce85885270990f8f2cf6c1f872fc855b3caf5bc1de01022caf0b05dd6957e55391cd8dcd15ff0cc18cf3035851a8289a2e12e17f2f50b626b68afd10e3f315
 	sha512sums = 6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb
 	sha512sums = a17db33ba5d6114bd71d1b013adc8e5ca0c3cedf856301cba59f95dadf643d2ee0e5a2d7abb2daedd5ed7c45cdbe93c78527f4d962bedc54776bb21cfc7e8b0b
 
diff --git a/PKGBUILD b/PKGBUILD
index 5073ca8b81d4..545b97f37339 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,17 +12,24 @@
 # Primary bug report: https://bugs.winehq.org/show_bug.cgi?id=47198
 
 pkgname=wine-lol
-pkgver=5.3
+# Note: We are forced to use Wine 5.6 until this bug is fixed:
+#       https://bugs.winehq.org/show_bug.cgi?id=49025
+pkgver=5.6
 pkgrel=1
 
 _pkgbasever=${pkgver/rc/-rc}
 
+# TODO: Remove 0005-server-Broadcast-rawinput-message-if-request-flag-is.patch
+#       here and in prepare() for wine >= 5.7
+#       Used to fix https://bugs.winehq.org/show_bug.cgi?id=48946
 source=(https://dl.winehq.org/wine/source/5.x/wine-$_pkgbasever.tar.xz
         "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz"
+        https://raw.githubusercontent.com/wine-staging/wine-staging/8d4d0a840e6ce434483edd81acb3be90fd734e44/patches/user32-rawinput-mouse/0005-server-Broadcast-rawinput-message-if-request-flag-is.patch
         30-win32-aliases.conf
         420CustomPatch1.diff)
-sha512sums=('40528f46ad10c11758308e3bf21ba73c7af133d4dda386d542acec3a5cb31e01be0eb102b94f9d82a2358e45597bf49bd1e82c463e3a26aff8c0827b5a0894b6'
-            'df14a61c04b134a72dc8662ee331fd234e2c82bf82824cb01443ae6516aba0bdcb579e2dbedc1ada47de0f3a1265c5fe9ef5f8183094d74451845b78d0a81702'
+sha512sums=('b12b0eff228ecd783fec8bf91f97e4387125226b172046d800e1fbffa303ceca32f1f647b9e8ceb24d303c23eb57188be14ddd8ba5fc04ba781a69186fbe6be4'
+            '7ddf5699834a6e04b094a7cae008175c874415d22554bac38176f3121b9533071ef610f8b5a0dd3ce3e4adf8a9d4ac214aa1cee7634959c5150b66fbb74710b7'
+            '13ce85885270990f8f2cf6c1f872fc855b3caf5bc1de01022caf0b05dd6957e55391cd8dcd15ff0cc18cf3035851a8289a2e12e17f2f50b626b68afd10e3f315'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
             'a17db33ba5d6114bd71d1b013adc8e5ca0c3cedf856301cba59f95dadf643d2ee0e5a2d7abb2daedd5ed7c45cdbe93c78527f4d962bedc54776bb21cfc7e8b0b')
 
@@ -124,6 +131,8 @@ prepare() {
 
   # apply wine-staging patchset
   pushd wine-staging-$_pkgbasever/patches
+  # Place updated patch
+  cp "$srcdir/0005-server-Broadcast-rawinput-message-if-request-flag-is.patch" user32-rawinput-mouse
   ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all
   popd
 
@@ -144,7 +153,9 @@ build() {
   mkdir $pkgname-{32,64}-build
 
   # https://bugs.winehq.org/show_bug.cgi?id=43530
-  export CFLAGS="${CFLAGS/-fno-plt/}"
+  # TODO: Remove -fcommon for wine >= 5.8
+  #       Used to work around gcc 10.1 build issue
+  export CFLAGS="${CFLAGS/-fno-plt/} -fcommon"
   export LDFLAGS="${LDFLAGS/,-z,now/}"
 
   # We need RPATH to point to the "lib32" in our prefix