Date: Friday, February 22, 2013 @ 18:48:32 Author: tpowa Revision: 178449
upgpkg: qemu 1.4.0-1 bump to 1.4.x series Added: qemu/trunk/doc-fix-sheepdog-invalid-texi-table-list-syntax.patch Modified: qemu/trunk/PKGBUILD -------------------------------------------------------+ PKGBUILD | 14 ++++--- doc-fix-sheepdog-invalid-texi-table-list-syntax.patch | 30 ++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-02-22 16:13:19 UTC (rev 178448) +++ PKGBUILD 2013-02-22 17:48:32 UTC (rev 178449) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Tobias Powalowski <[email protected]> pkgname=qemu -pkgver=1.3.1 -pkgrel=2 +pkgver=1.4.0 +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') @@ -12,6 +12,7 @@ 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) @@ -19,7 +20,10 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/lib64/lib/g' x86_64.ld + 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 ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl,pa \ --python=/usr/bin/python2 \ --audio-card-list=ac97,sb16,es1370,hda \ @@ -48,6 +52,6 @@ done } - -md5sums=('5dbc6c22f47efca71dfaae0dd80dcf9e' +md5sums=('78f13b774814b6b7ebcaf4f9b9204318' + 'b431782f310bfc6af4ef21a8068f866b' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') Added: doc-fix-sheepdog-invalid-texi-table-list-syntax.patch =================================================================== --- doc-fix-sheepdog-invalid-texi-table-list-syntax.patch (rev 0) +++ doc-fix-sheepdog-invalid-texi-table-list-syntax.patch 2013-02-22 17:48:32 UTC (rev 178449) @@ -0,0 +1,30 @@ +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
