summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--sphinx4.patch8
3 files changed, 17 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3f81b397c693..3a0623af968f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qemu-git
pkgdesc = A generic and open source machine emulator and virtualizer. Git version.
pkgver = 6.0.0.r339.ge4f3ede95c
- pkgrel = 1
+ pkgrel = 2
epoch = 13
url = http://wiki.qemu.org/
arch = i686
@@ -47,9 +47,11 @@ pkgbase = qemu-git
source = git://git.qemu.org/qemu.git
source = qemu-guest-agent.service
source = 65-kvm.rules
+ source = sphinx4.patch
sha256sums = SKIP
sha256sums = 09a720ed48ef8cf0f67770b67874202600c5209973d10e6e2c72ecc9aea23ece
sha256sums = 60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7
+ sha256sums = 5c07cc01b152709cb297dc1c3ba1f320c085c9bdf9ebc0de7993eface39b963f
pkgname = qemu-git
optdepends = qemu-arch-extra-git: extra architectures support
diff --git a/PKGBUILD b/PKGBUILD
index 51f6967146c4..30d142c02404 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ _gitname=qemu
pkgname=(qemu-git qemu-headless-git qemu-arch-extra-git qemu-headless-arch-extra-git qemu-block-{iscsi-git,rbd-git,gluster-git} qemu-guest-agent-git)
pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
pkgver=6.0.0.r339.ge4f3ede95c
-pkgrel=1
+pkgrel=2
epoch=13
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
@@ -21,10 +21,12 @@ depends=(dtc virglrenderer sdl2 vte3 libpulse brltty "${_headlessdeps[@]}")
makedepends=(spice-protocol python ceph libiscsi glusterfs python-sphinx xfsprogs git ninja)
source=(git://git.qemu.org/qemu.git
qemu-guest-agent.service
- 65-kvm.rules)
+ 65-kvm.rules
+ sphinx4.patch)
sha256sums=('SKIP'
'09a720ed48ef8cf0f67770b67874202600c5209973d10e6e2c72ecc9aea23ece'
- '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7')
+ '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7'
+ '5c07cc01b152709cb297dc1c3ba1f320c085c9bdf9ebc0de7993eface39b963f')
case $CARCH in
i?86) _corearch=i386 ;;
@@ -40,7 +42,7 @@ prepare() {
cd "${srcdir}/${_gitname}"
mkdir build-{full,headless}
mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu}
-
+ patch -Np1 < ../sphinx4.patch
}
build() {
@@ -72,7 +74,6 @@ _build() (
--enable-vhost-user \
--enable-slirp=system \
--enable-xfsctl \
- --disable-docs \
"${@:2}"
ninja
diff --git a/sphinx4.patch b/sphinx4.patch
new file mode 100644
index 000000000000..5f32ae78975f
--- /dev/null
+++ b/sphinx4.patch
@@ -0,0 +1,8 @@
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -269,6 +269,7 @@
+ ['Stefan Hajnoczi <stefanha@redhat.com>',
+ 'Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>'], 1),
+ ]
++man_make_section_directory = False
+