diff --git a/mingw-w64-qemu/001-iovec-sasl-conflict.patch b/mingw-w64-qemu/001-iovec-sasl-conflict.patch deleted file mode 100644 index 12f48ace42..0000000000 --- a/mingw-w64-qemu/001-iovec-sasl-conflict.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 203a592e34..e360771c89 100644 --- a/mingw-w64-qemu/PKGBUILD +++ b/mingw-w64-qemu/PKGBUILD @@ -3,7 +3,7 @@ _realname=qemu pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -_base_ver=4.2.0 +_base_ver=5.0.0 _rc= pkgver=${_base_ver}${_rc//-/.} pkgrel=1 @@ -32,11 +32,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-capstone" "${MINGW_PACKAGE_PREFIX}-snappy" "${MINGW_PACKAGE_PREFIX}-SDL2" "${MINGW_PACKAGE_PREFIX}-SDL2_image" - "${MINGW_PACKAGE_PREFIX}-usbredir") -source=(https://download.qemu.org/${_realname}-${pkgver}.tar.xz - 001-iovec-sasl-conflict.patch) -sha256sums=('d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0' - '87525c95012de861fc7d5ff1554741ed23fae732bb50258a9d8083c43c5a2420') + "${MINGW_PACKAGE_PREFIX}-libslirp" + "${MINGW_PACKAGE_PREFIX}-usbredir" + "${MINGW_PACKAGE_PREFIX}-zstd") +source=(https://download.qemu.org/${_realname}-${pkgver}.tar.xz{,.sig}) +sha256sums=('2f13a92a0fa5c8b69ff0796b59b86b080bbb92ebad5d301a7724dd06b5e78cb6' + 'SKIP') +validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') # Michael Roth noextract=(${_realname}-${pkgver}.tar.xz) prepare() { @@ -44,7 +46,6 @@ prepare() { tar -xJf ${srcdir}/${_realname}-${pkgver}.tar.xz -C ${srcdir} || true cd "${srcdir}/${_realname}-${pkgver}" - patch -p1 -i ${srcdir}/001-iovec-sasl-conflict.patch } build() { @@ -54,15 +55,19 @@ build() { ./configure \ --disable-werror \ --disable-kvm \ - --disable-bluez \ --disable-spice \ --disable-libnfs \ + --enable-capstone=system \ + --enable-gnutls \ --enable-libssh \ --enable-lzo \ + --enable-nettle \ + --enable-slirp=system \ --enable-snappy \ --enable-hax \ --enable-gtk \ --enable-sdl \ + --enable-zstd \ --prefix=${MINGW_PREFIX} \ --bindir=${MINGW_PREFIX}/bin \ --datadir=${MINGW_PREFIX}/bin \ @@ -70,7 +75,7 @@ build() { --python=${MINGW_PREFIX}/bin/python \ --mandir=${MINGW_PREFIX}/share/qemu \ --docdir=${MINGW_PREFIX}/share/qemu - make -j1 + make } package() {