diff --git a/hardware/virtualization/virt-manager/actions.py b/hardware/virtualization/virt-manager/actions.py index 083beddcc3..b02129a55d 100644 --- a/hardware/virtualization/virt-manager/actions.py +++ b/hardware/virtualization/virt-manager/actions.py @@ -4,16 +4,19 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/copyleft/gpl.txt. -from pisi.actionsapi import pisitools from pisi.actionsapi import pythonmodules +from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools +from pisi.actionsapi import get def setup(): - shelltools.system("sed -i 's|python2|python2.7|g' {setup.py,virt-convert,virt-clone,virt-install,virt-manager,virt-xml}") - - pythonmodules.configure() - pythonmodules.compile() + pythonmodules.configure("--default-graphics=spice --default-hvs qemu,xen,lxc", pyVer="3") + pythonmodules.compile(pyVer="3") def install(): - pythonmodules.install() + shelltools.system("""touch --no-create %s/usr/share/icons/hicolor >/dev/null 2>&1 || : + /usr/bin/update-desktop-database > /dev/null 2>&1 || :""" % get.installDIR()) + + shelltools.system("python3 setup.py --no-update-icon-cache --no-compile-schemas install --root=%s --no-compile -O0" % get.installDIR()) + #pythonmodules.install(pyVer="3") #pisitools.dodoc("COPYING", "NEWS", "README*", "PKG-INFO") diff --git a/hardware/virtualization/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch b/hardware/virtualization/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch new file mode 100644 index 0000000000..ace1690248 --- /dev/null +++ b/hardware/virtualization/virt-manager/files/virt-manager-4.0.0-setuptools-61-fix.patch @@ -0,0 +1,34 @@ +From c6fc4524d4448259ea85f93f85898b64a4380154 Mon Sep 17 00:00:00 2001 +From: Peter Alfredsen +Date: Tue, 5 Apr 2022 22:04:20 +0200 +Subject: [PATCH] setup: add bits for setuptools-61 + +Quoting https://github.com/pypa/setuptools/issues/3227 +"Setuptools >= 61, intentionally changes the way packages are built in the + sensec that it will try to find files and fail if something is weird. + + Empty packages (like this one), are asked to explicitly add packages=[] + to their configuration. + + This intentional change in behaviour is described in + https://setuptools.pypa.io/en/latest/history.html#v61-0-0." + +Bug: https://bugs.gentoo.org/836645 +Signed-off-by: Peter Alfredsen +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index e95acd39..7e47e7c7 100755 +--- a/setup.py ++++ b/setup.py +@@ -547,4 +547,5 @@ setuptools.setup( + }, + + distclass=VMMDistribution, ++ packages=[], + ) +-- +2.35.1 + diff --git a/hardware/virtualization/virt-manager/pspec.xml b/hardware/virtualization/virt-manager/pspec.xml index beec0be5a2..586c8aaa27 100644 --- a/hardware/virtualization/virt-manager/pspec.xml +++ b/hardware/virtualization/virt-manager/pspec.xml @@ -9,22 +9,26 @@ admins@pisilinux.org GPLv2+ - virt-manager-icon + virt-manager app:gui Graphical tool for administering virtual machines for KVM, Xen, and QEmu Virtual Machine Manager provides a graphical tool for administering virtual machines for KVM, Xen, and QEmu. Start, stop, add or remove virtual devices, connect to a graphical or serial console, and see resource usage statistics for existing VMs on local or remote machines. Uses libvirt as the backend management API. - https://releases.pagure.org/virt-manager/virt-manager-1.5.1.tar.gz + https://releases.pagure.org/virt-manager/virt-manager-4.0.0.tar.gz intltool vte-devel gtk2-devel + python3-devel + python-docutils libosinfo-devel + python3-setuptools libvirt-glib-devel - python-cairo-devel - python-pygobject3-devel + python3-cairo-devel + python3-pygobject3-devel + desktop-file-utils - + virt-manager-4.0.0-setuptools-61-fix.patch @@ -34,8 +38,8 @@ ipaddr libosinfo libvirt-glib - libvirt-python - python-pygobject3 + libvirt-python3 + python3-pygobject3 /usr/bin @@ -48,11 +52,18 @@ /usr/share/locale - tr.po + + + 2022-07-08 + 4.0.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-03-19 1.5.1