summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2023-06-30 19:58:36 +0200
committerFrederic Bezies2023-06-30 19:58:36 +0200
commit230fe5f224b011ecdac1ab0a04097f088327cdd2 (patch)
tree625613cd251313d1a70e9396548bf26e03743f18
parentc765ed780acde220473146f402618b2b63ec7b2c (diff)
downloadaur-230fe5f224b011ecdac1ab0a04097f088327cdd2.tar.gz
Fix for bug https://gitlab.com/qemu-project/qemu/-/issues/1739
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
-rw-r--r--dbus.patch10
3 files changed, 20 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ff70bdd34db..d5ea327739c6 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 = 8.0.0.r2024.g79dbd910c9
+ pkgver = 8.0.0.r2304.g408015a97d
pkgrel = 1
epoch = 19
url = https://wiki.qemu.org/
@@ -70,9 +70,11 @@ pkgbase = qemu-git
source = git+https://gitlab.com/qemu-project/qemu.git
source = qemu-guest-agent.service
source = 65-kvm.rules
+ source = dbus.patch
sha256sums = SKIP
sha256sums = c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88
sha256sums = a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c
+ sha256sums = 8e34f65bc6e4923a13b5542b11ad29fc3fe3dc8ebf82cbb5bf43848e7b4b75eb
pkgname = qemu-git
pkgdesc = QEMU Git version.
diff --git a/PKGBUILD b/PKGBUILD
index a145edd40356..8f7a057d24a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=(
qemu-guest-agent-git
)
pkgdesc="A generic and open source machine emulator and virtualizer. Git version."
-pkgver=8.0.0.r2024.g79dbd910c9
+pkgver=8.0.0.r2304.g408015a97d
pkgrel=1
epoch=19
arch=(i686 x86_64)
@@ -86,10 +86,12 @@ makedepends=(
)
source=(git+https://gitlab.com/qemu-project/qemu.git
qemu-guest-agent.service
- 65-kvm.rules)
+ 65-kvm.rules
+ dbus.patch)
sha256sums=('SKIP'
'c39bcde4a09165e64419fd2033b3532378bba84d509d39e2d51694d44c1f8d88'
- 'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c')
+ 'a66f0e791b16b03b91049aac61a25950d93e962e1b2ba64a38c6ad7f609b532c'
+ '8e34f65bc6e4923a13b5542b11ad29fc3fe3dc8ebf82cbb5bf43848e7b4b75eb')
case $CARCH in
i?86) _corearch=i386 ;;
@@ -105,6 +107,8 @@ prepare() {
cd "${srcdir}/${_gitname}"
mkdir build-{full,headless}
mkdir -p extra-arch-{full,headless}/usr/{bin,share/qemu}
+ # Fix for bug https://gitlab.com/qemu-project/qemu/-/issues/1739
+ patch -Np1 -i ../dbus.patch
}
build() {
diff --git a/dbus.patch b/dbus.patch
new file mode 100644
index 000000000000..5d8a6abed53c
--- /dev/null
+++ b/dbus.patch
@@ -0,0 +1,10 @@
+--- a/audio/meson.build
++++ b/audio/meson.build
+@@ -31,7 +31,7 @@ endforeach
+
+ if dbus_display
+ module_ss = ss.source_set()
+- module_ss.add(when: gio, if_true: files('dbusaudio.c'))
++ module_ss.add(when: [gio, pixman], if_true: files('dbusaudio.c'))
+ audio_modules += {'dbus': module_ss}
+ endif