From 6d9aa055e427c771ad78374b26ba3c1119aece1c Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Tue, 2 Jul 2024 09:49:39 -0400
Subject: [PATCH] extra/libvirt to 10.5.0-1

---
 extra/libvirt/.SRCINFO | 17 +++++++++--------
 extra/libvirt/PKGBUILD |  7 ++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/extra/libvirt/.SRCINFO b/extra/libvirt/.SRCINFO
index 5e9690962..ae904ee03 100644
--- a/extra/libvirt/.SRCINFO
+++ b/extra/libvirt/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libvirt
 	pkgdesc = API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)
-	pkgver = 10.4.0
+	pkgver = 10.5.0
 	pkgrel = 1
 	epoch = 1
 	url = https://libvirt.org/
@@ -37,7 +37,8 @@ pkgbase = libvirt
 	optdepends = dnsmasq: required for default NAT/DHCP for guests
 	optdepends = radvd: IPv6 RAD support
 	optdepends = iptables-nft: required for default NAT networking
-	optdepends = qemu-desktop: QEMU/KVM support
+	optdepends = qemu-base: QEMU/KVM support
+	optdepends = qemu-desktop: QEMU/KVM desktop support
 	optdepends = qemu-emulators-full: Support of additional QEMU architectures
 	optdepends = lvm2: Logical Volume Manager support
 	optdepends = open-iscsi: iSCSI support via iscsiadm
@@ -91,14 +92,14 @@ pkgbase = libvirt
 	backup = etc/logrotate.d/libvirtd.lxc
 	backup = etc/logrotate.d/libvirtd.qemu
 	backup = etc/sasl2/libvirt.conf
-	source = https://libvirt.org/sources/libvirt-10.4.0.tar.xz
-	source = https://libvirt.org/sources/libvirt-10.4.0.tar.xz.asc
+	source = https://libvirt.org/sources/libvirt-10.5.0.tar.xz
+	source = https://libvirt.org/sources/libvirt-10.5.0.tar.xz.asc
 	validpgpkeys = 453B65310595562855471199CA68BE8010084C9C
-	sha256sums = d1308be98da418ce463f0d9e4ac28a94b1a859364db3bb078d6e153dc587efe4
+	sha256sums = 8e853a9c91c9029b9019cf5fdf2b5fea36d501d563e43254efc20e12c00557e8
 	sha256sums = SKIP
 
 pkgname = libvirt
-	provides = libvirt=10.4.0
+	provides = libvirt=10.5.0
 	provides = libvirt.so
 	provides = libvirt-admin.so
 	provides = libvirt-lxc.so
@@ -106,14 +107,14 @@ pkgname = libvirt
 
 pkgname = libvirt-storage-gluster
 	pkgdesc = Libvirt Gluster storage backend
-	depends = libvirt=10.4.0
+	depends = libvirt=10.5.0
 	depends = glusterfs
 	optdepends = 
 	backup = 
 
 pkgname = libvirt-storage-iscsi-direct
 	pkgdesc = Libvirt iSCSI-direct storage backend
-	depends = libvirt=10.4.0
+	depends = libvirt=10.5.0
 	depends = libiscsi
 	optdepends = 
 	backup = 
diff --git a/extra/libvirt/PKGBUILD b/extra/libvirt/PKGBUILD
index a4908af2d..5b80306fa 100644
--- a/extra/libvirt/PKGBUILD
+++ b/extra/libvirt/PKGBUILD
@@ -6,10 +6,11 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - removed qemu makedepend
+#  - removed qemu-base, qemu-desktop, qemu-emulators-full optdepends
 
 pkgname=(libvirt libvirt-storage-gluster libvirt-storage-iscsi-direct)
 epoch=1
-pkgver=10.4.0
+pkgver=10.5.0
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('x86_64')
@@ -86,7 +87,7 @@ backup=(
 source=(
   "https://libvirt.org/sources/$pkgname-$pkgver.tar.xz"{,.asc}
 )
-sha256sums=('d1308be98da418ce463f0d9e4ac28a94b1a859364db3bb078d6e153dc587efe4'
+sha256sums=('8e853a9c91c9029b9019cf5fdf2b5fea36d501d563e43254efc20e12c00557e8'
             'SKIP')
 validpgpkeys=('453B65310595562855471199CA68BE8010084C9C') # Jiří Denemark <jdenemar@redhat.com>
 
@@ -95,7 +96,7 @@ prepare() {
 
   sed -i 's|/sysconfig/|/conf.d/|g' \
     src/remote/libvirtd.service.in \
-    tools/{libvirt-guests.service,libvirt-guests.sh,virt-pki-validate}.in \
+    tools/{libvirt-guests.service,libvirt-guests.sh}.in \
     docs/manpages/libvirt-guests.rst \
     src/locking/virtlockd.service.in \
     src/logging/virtlogd.service.in