summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD9
-rw-r--r--sphinx4.patch8
3 files changed, 4 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a54adf5053a..804df48ccae0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qemu-git
pkgdesc = A generic and open source machine emulator and virtualizer. Git version.
- pkgver = 6.0.0.r1140.gc8616fc767
+ pkgver = 6.0.0.r1407.g453d9c61dd
pkgrel = 1
epoch = 13
url = http://wiki.qemu.org/
@@ -42,11 +42,9 @@ 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
@@ -121,4 +119,3 @@ pkgname = qemu-guest-agent-git
depends = liburing
provides = qemu-guest-agent
conflicts = qemu-guest-agent
-
diff --git a/PKGBUILD b/PKGBUILD
index 436aa9026bbe..8d6b5c7f20f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=qemu-git
_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.r1140.gc8616fc767
+pkgver=6.0.0.r1407.g453d9c61dd
pkgrel=1
epoch=13
arch=(i686 x86_64)
@@ -21,12 +21,10 @@ 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
- sphinx4.patch)
+ 65-kvm.rules)
sha256sums=('SKIP'
'09a720ed48ef8cf0f67770b67874202600c5209973d10e6e2c72ecc9aea23ece'
- '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7'
- '5c07cc01b152709cb297dc1c3ba1f320c085c9bdf9ebc0de7993eface39b963f')
+ '60dcde5002c7c0b983952746e6fb2cf06d6c5b425d64f340f819356e561e7fc7')
case $CARCH in
i?86) _corearch=i386 ;;
@@ -42,7 +40,6 @@ prepare() {
cd "${srcdir}/${_gitname}"
mkdir build-{full,headless}
mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu}
- patch -Np1 < ../sphinx4.patch
}
build() {
diff --git a/sphinx4.patch b/sphinx4.patch
deleted file mode 100644
index 5f32ae78975f..000000000000
--- a/sphinx4.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
-