Add patch for WINE 2.2 build failure

3 files changed, 30 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1616f223264..d9724663b749 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = airwave-git
 	pkgdesc = Airwave is a WINE-based VST bridge, that allows for the use of Windows 32- and 64-bit VST 2.4 audio plugins with Linux VST hosts
 	pkgver = r155.8cd3507
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/phantom-code/airwave
 	arch = i686
 	arch = x86_64
@@ -15,7 +15,9 @@ pkgbase = airwave-git
 	provides = airwave
 	conflicts = airwave
 	source = git+https://github.com/phantom-code/airwave.git#branch=master
+	source = 70d8503d5ec602be0dd9f5e390f703402bdd5edc.diff
 	sha256sums = SKIP
+	sha256sums = 5ca16090edea771f3190a2931e4a9b25d74985724270ad0126e8c6d528031ba3
 
 pkgname = airwave-git
 
diff --git a/70d8503d5ec602be0dd9f5e390f703402bdd5edc.diff b/70d8503d5ec602be0dd9f5e390f703402bdd5edc.diff
new file mode 100644
index 000000000000..f0d86ce0bb4b
--- /dev/null
+++ b/70d8503d5ec602be0dd9f5e390f703402bdd5edc.diff
@@ -0,0 +1,15 @@
+Description: Add back a typecast that's needed for C++
+ Fix for https://bugs.winehq.org/show_bug.cgi?id=42511
+Author: Alexandre Julliard <julliard_winehq_org>
+
+--- a/airwave/src/host/winnt.h
++++ b/airwave/src/host/winnt.h
+@@ -5438,7 +5438,7 @@ typedef enum _CM_ERROR_CONTROL_TYPE
+ 
+ static FORCEINLINE void *RtlSecureZeroMemory(void *buffer, SIZE_T length)
+ {
+-    volatile char *ptr = buffer;
++    volatile char *ptr = (volatile char *)buffer;
+ 
+     while (length--) *ptr++ = 0;
+     return buffer;
diff --git a/PKGBUILD b/PKGBUILD
index e6682fd4cc99..4111a30caf26 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _basename=airwave
 pkgname=${_basename}-git
 pkgver=r155.8cd3507
-pkgrel=1
+pkgrel=2
 pkgdesc="Airwave is a WINE-based VST bridge, that allows for the use of Windows 32- and 64-bit VST 2.4 audio plugins with Linux VST hosts"
 arch=("i686" "x86_64")
 license=("MIT")
@@ -19,9 +19,11 @@ fi
 provides=("airwave")
 conflicts=("airwave")
 
-source=("git+https://github.com/phantom-code/airwave.git#branch=master")
+source=("git+https://github.com/phantom-code/airwave.git#branch=master"
+        "70d8503d5ec602be0dd9f5e390f703402bdd5edc.diff")
 
-sha256sums=("SKIP")
+sha256sums=('SKIP'
+            '5ca16090edea771f3190a2931e4a9b25d74985724270ad0126e8c6d528031ba3')
 
 pkgver()
 {
@@ -29,6 +31,13 @@ pkgver()
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare()
+{
+    # Fix for https://bugs.winehq.org/show_bug.cgi?id=42511
+    cp /usr/include/wine/windows/winnt.h "${_basename}/src/host/"
+    patch -Np1 -i "${srcdir}/70d8503d5ec602be0dd9f5e390f703402bdd5edc.diff"
+}
+
 build()
 {
 	cd "${_basename}"