From 786a2da74d15543b13be716b81e417149123281a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 18 Dec 2018 01:27:01 +0000
Subject: [PATCH] extra/qemu to 3.1.0-1

---
 extra/qemu/PKGBUILD | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 42900f098..21704dc98 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -11,8 +11,8 @@ pkgbase=qemu
 pkgname=(qemu qemu-headless qemu-arch-extra qemu-headless-arch-extra
          qemu-block-{iscsi,rbd,gluster} qemu-guest-agent)
 pkgdesc="A generic and open source machine emulator and virtualizer"
-pkgver=3.0.0
-pkgrel=4
+pkgver=3.1.0
+pkgrel=1
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
 url="http://wiki.qemu.org/"
@@ -23,14 +23,12 @@ makedepends=(spice-protocol python2 ceph libiscsi glusterfs)
 source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}
         qemu-ga.service
         65-kvm.rules
-        allow_elf64.patch
-        fix_virtio.patch::https://github.com/qemu/qemu/commit/db812c4073c77c8a64db8d6663b3416a587c7b4a.patch)
-sha512sums=('a764302f50b9aca4134bbbc1f361b98e71240cdc7b25600dfe733bf4cf17bd86000bd28357697b08f3b656899dceb9e459350b8d55557817444ed5d7fa380a5a'
+        allow_elf64.patch)
+sha512sums=('7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe'
             'SKIP'
             '269c0f0bacbd06a3d817fde02dce26c99d9f55c9e3b74bb710bd7e5cdde7a66b904d2eb794c8a605bf9305e4e3dee261a6e7d4ec9d9134144754914039f176e4'
             'bdf05f99407491e27a03aaf845b7cc8acfa2e0e59968236f10ffc905e5e3d5e8569df496fd71c887da2b5b8d1902494520c7da2d3a8258f7fd93a881dd610c99'
-            'b450625ff1e705f8c7eed9e2c0c4fe2179ca061df88a1a777c861c11d543c151cd0160f7f7227babdfe8b36000de084cbcb6fd7bf0f93d2f936c2e65082c82bf'
-            '5a27d4ddee9b75b32015e2b2e8612a49406809a50e9d1c30de60593581363a4eeb24343d2e939c950d06852d21d95560c9cb518d043b981f2e681ab6a5927290')
+            'b450625ff1e705f8c7eed9e2c0c4fe2179ca061df88a1a777c861c11d543c151cd0160f7f7227babdfe8b36000de084cbcb6fd7bf0f93d2f936c2e65082c82bf')
 validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584')
 
 case $CARCH in
@@ -48,9 +46,6 @@ prepare() {
   sed -i 's/vte-2\.90/vte-2.91/g' configure
 
   patch -p1 < ../allow_elf64.patch
-
-  # FS#60141
-  patch -p1 < ../fix_virtio.patch
 }
 
 build() {
@@ -83,7 +78,6 @@ _build() (
     --libexecdir=/usr/lib/qemu \
     --python=/usr/bin/python2 \
     --smbd=/usr/bin/smbd \
-    --with-gtkabi=3.0 \
     --with-sdlabi=2.0 \
     --enable-modules \
     --enable-jemalloc \