From fc7fc237d093b17975b5167571fa2a9d53ebedcf Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 28 Nov 2018 15:37:36 +0300
Subject: [PATCH] qemu: Add more dependencies. Fix building

---
 mingw-w64-qemu/001-iovec-sasl-conflict.patch | 16 ++++++++++++++++
 mingw-w64-qemu/PKGBUILD                      | 18 +++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 mingw-w64-qemu/001-iovec-sasl-conflict.patch

diff --git a/mingw-w64-qemu/001-iovec-sasl-conflict.patch b/mingw-w64-qemu/001-iovec-sasl-conflict.patch
new file mode 100644
index 0000000000..12f48ace42
--- /dev/null
+++ b/mingw-w64-qemu/001-iovec-sasl-conflict.patch
@@ -0,0 +1,16 @@
+--- qemu-3.0.0/include/qemu/osdep.h.orig	2018-11-28 14:06:45.404308700 +0300
++++ qemu-3.0.0/include/qemu/osdep.h	2018-11-28 14:06:57.699130400 +0300
+@@ -452,10 +452,13 @@
+ int qemu_get_thread_id(void);
+ 
+ #ifndef CONFIG_IOVEC
++#ifndef STRUCT_IOVEC_DEFINED
++#define STRUCT_IOVEC_DEFINED 1
+ struct iovec {
+     void *iov_base;
+     size_t iov_len;
+ };
++#endif
+ /*
+  * Use the same value as Linux for now.
+  */
diff --git a/mingw-w64-qemu/PKGBUILD b/mingw-w64-qemu/PKGBUILD
index a7d50dfd55..12265419b3 100644
--- a/mingw-w64-qemu/PKGBUILD
+++ b/mingw-w64-qemu/PKGBUILD
@@ -14,6 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              'perl' 'bison' 'bsdtar')
 depends=("${MINGW_PACKAGE_PREFIX}-capstone"
          "${MINGW_PACKAGE_PREFIX}-curl"
+         "${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
          "${MINGW_PACKAGE_PREFIX}-glib2"
          "${MINGW_PACKAGE_PREFIX}-gnutls"
          "${MINGW_PACKAGE_PREFIX}-gtk3"
@@ -26,11 +27,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-capstone"
          "${MINGW_PACKAGE_PREFIX}-snappy"
          "${MINGW_PACKAGE_PREFIX}-SDL"
          "${MINGW_PACKAGE_PREFIX}-usbredir")
-source=(https://download.qemu.org/${_realname}-${pkgver}.tar.xz)
-sha256sums=('8d7af64fe8bd5ea5c3bdf17131a8b858491bcce1ee3839425a6d91fb821b5713')
+source=(https://download.qemu.org/${_realname}-${pkgver}.tar.xz
+        001-iovec-sasl-conflict.patch)
+sha256sums=('8d7af64fe8bd5ea5c3bdf17131a8b858491bcce1ee3839425a6d91fb821b5713'
+            '87525c95012de861fc7d5ff1554741ed23fae732bb50258a9d8083c43c5a2420')
+
+prepare() {
+    cd "${srcdir}/${_realname}-${pkgver}"
+    patch -p1 -i ${srcdir}/001-iovec-sasl-conflict.patch
+}
 
 build() {
-    cd "$srcdir/$_realname-$pkgver"
+    cd "${srcdir}/${_realname}-${pkgver}"
     ./configure \
         --disable-stack-protector \
         --disable-werror \
@@ -56,6 +64,6 @@ build() {
 }
 
 package() {
-    cd "$srcdir/$_realname-$pkgver"
-    make DESTDIR="$pkgdir/" install
+    cd "${srcdir}/${_realname}-${pkgver}"
+    make DESTDIR="${pkgdir}/" install
 }