From e90166c70f3a2bd27d8c914491f7e0510855fd3f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sat, 8 Jun 2013 00:07:33 -0700
Subject: Sat Jun  8 00:07:33 PDT 2013

---
 extra/qemu/PKGBUILD                                | 15 ++++-------
 ...x-sheepdog-invalid-texi-table-list-syntax.patch | 30 ----------------------
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch

(limited to 'extra/qemu')

diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index f7ea473ee..e849ff4e4 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,18 +1,17 @@
 # $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=qemu
-pkgver=1.4.1
-pkgrel=3
+pkgver=1.4.2
+pkgrel=1
 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
 makedepends=('texi2html' 'perl' 'python2')
-depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
+depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng')
 backup=('etc/qemu/target-x86_64.conf')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
-        doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
         65-kvm.rules)
 replaces=('qemu-kvm')
 options=(!strip)
@@ -21,15 +20,12 @@ prepare()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld
-  # fix building with tex version 5.0
-  # https://bugs.launchpad.net/qemu/+bug/1130533
-  patch -Np1 -i ${srcdir}/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
 }
 
 build ()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"  
-  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \
+  ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=alsa,sdl,pa \
               --python=/usr/bin/python2 \
               --audio-card-list=ac97,sb16,es1370,hda \
               --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu
@@ -57,6 +53,5 @@ package() {
     done
 
 }
-md5sums=('eb2d696956324722b5ecfa46e41f9a75'
-         'b431782f310bfc6af4ef21a8068f866b'
+md5sums=('b3eafa033ae4b8faba584f9f141b888f'
          'b316a066d2f1bb57d8f5b7ea1d0d1caf')
diff --git a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch b/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
deleted file mode 100644
index bacc87e80..000000000
--- a/extra/qemu/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/qemu-options.hx b/qemu-options.hx
-index 4bc9c85..3af60bf 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -2095,18 +2095,13 @@ QEMU supports using either local sheepdog devices or remote networked
- devices.
- 
- Syntax for specifying a sheepdog device
--@table @list
--``sheepdog:<vdiname>''
--
--``sheepdog:<vdiname>:<snapid>''
--
--``sheepdog:<vdiname>:<tag>''
--
--``sheepdog:<host>:<port>:<vdiname>''
--
--``sheepdog:<host>:<port>:<vdiname>:<snapid>''
--
--``sheepdog:<host>:<port>:<vdiname>:<tag>''
-+@table @code
-+@item sheepdog:<vdiname>
-+@item sheepdog:<vdiname>:<snapid>
-+@item sheepdog:<vdiname>:<tag>
-+@item sheepdog:<host>:<port>:<vdiname>
-+@item sheepdog:<host>:<port>:<vdiname>:<snapid>
-+@item sheepdog:<host>:<port>:<vdiname>:<tag>
- @end table
- 
- Example
-- 
cgit v1.2.3-54-g00ecf