3 files changed, 45 insertions, 81 deletions

diff --git a/recipes-extended/virt-manager/virt-manager/0001-build-drop-man-directory.patch b/recipes-extended/virt-manager/virt-manager/0001-build-drop-man-directory.patch
new file mode 100644
index 00000000..043428b9
--- /dev/null
+++ b/recipes-extended/virt-manager/virt-manager/0001-build-drop-man-directory.patch
@@ -0,0 +1,31 @@
+From f86dfffa8d443ec640b1c76d2eeccd6a4913305d Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Fri, 17 Jan 2025 15:32:51 +0000
+Subject: [PATCH] build: drop man directory
+
+The man pages require rst2man, which isn't available (or at least
+not trivial to provide), so we drop the man directory to avoid
+building the pages.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 8862ada8f..22a14d53f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -15,7 +15,6 @@ pkgdir = datadir / 'virt-manager'
+ git = run_command('test', '-e', '.git', check: false).returncode() == 0
+ 
+ subdir('scripts')
+-subdir('man')
+ subdir('data')
+ subdir('ui')
+ subdir('virtinst')
+-- 
+2.39.2
+
diff --git a/recipes-extended/virt-manager/virt-manager/0001-setup.py-move-global-args-to-install-args.patch b/recipes-extended/virt-manager/virt-manager/0001-setup.py-move-global-args-to-install-args.patch
deleted file mode 100644
index f0bbf73b..00000000
--- a/recipes-extended/virt-manager/virt-manager/0001-setup.py-move-global-args-to-install-args.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From bcdb3555b924573e85039b54d63d6173ad99b846 Mon Sep 17 00:00:00 2001
-From: Paul Le Guen de Kerneizon <paul.leguendekerneizon@savoirfairelinux.com>
-Date: Wed, 28 Feb 2024 10:24:00 +0100
-Subject: [PATCH] setup.py: move global args to install args
-
-Presently, during the installation process, global arguments such as
-`no-update-icon-cache` and `no-compile-schemas` are utilized to
-prevent the installation of specific graphical components. These
-arguments are essential, for instance, when installing virt-manager
-without any GUI dependencies on the target system. However, these
-global arguments must be set before the install command, yet they only
-take effect during the execution of the command.
-
-Since the Yocto `setuptools3_legacy` class parses arguments after the
-command, this commit aims to make these arguments applicable locally to
-the install command.
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Paul Le Guen de Kerneizon <paul.leguendekerneizon@savoirfairelinux.com>
----
- setup.py | 20 ++++++++++++--------
- 1 file changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index cd6cd83e..faca546a 100755
---- a/setup.py
-+++ b/setup.py
-@@ -242,6 +242,16 @@ class my_egg_info(setuptools.command.install_egg_info.install_egg_info):
-
-
- class my_install(setuptools.command.install.install):
-+    setuptools.command.install.install.user_options += [
-+        ("no-update-icon-cache", None, "Don't run gtk-update-icon-cache"),
-+        ("no-compile-schemas", None, "Don't compile gsettings schemas"),
-+    ]
-+
-+    def initialize_options(self):
-+        setuptools.command.install.install.initialize_options(self)
-+        self.no_update_icon_cache = None
-+        self.no_compile_schemas = None
-+
-     """
-     Error if we weren't 'configure'd with the correct install prefix
-     """
-@@ -266,12 +276,12 @@ class my_install(setuptools.command.install.install):
-     def run(self):
-         setuptools.command.install.install.run(self)
-
--        if not self.distribution.no_update_icon_cache:
-+        if not self.no_update_icon_cache:
-             print("running gtk-update-icon-cache")
-             icon_path = os.path.join(self.install_data, "share/icons/hicolor")
-             self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
-
--        if not self.distribution.no_compile_schemas:
-+        if not self.no_compile_schemas:
-             print("compiling gsettings schemas")
-             gschema_install = os.path.join(self.install_data,
-                 "share/glib-2.0/schemas")
-@@ -421,14 +431,8 @@ class CheckPylint(setuptools.Command):
-
-
- class VMMDistribution(setuptools.dist.Distribution):
--    global_options = setuptools.dist.Distribution.global_options + [
--        ("no-update-icon-cache", None, "Don't run gtk-update-icon-cache"),
--        ("no-compile-schemas", None, "Don't compile gsettings schemas"),
--    ]
-
-     def __init__(self, *args, **kwargs):
--        self.no_update_icon_cache = False
--        self.no_compile_schemas = False
-         setuptools.dist.Distribution.__init__(self, *args, **kwargs)
-
-
---
-2.34.1
-
diff --git a/recipes-extended/virt-manager/virt-manager_4.1.0.bb b/recipes-extended/virt-manager/virt-manager_git.bb
index d752fd2b..71806077 100644
--- a/recipes-extended/virt-manager/virt-manager_4.1.0.bb
+++ b/recipes-extended/virt-manager/virt-manager_git.bb
@@ -3,26 +3,34 @@ HOMEPAGE = "https://virt-manager.org/"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS += "python3-docutils-native"
-SRCREV = "6710ca6969b7d9c4e8344acd0fe3d50b24adc8ec"
+SRCREV = "da2f65f9262fc18e2b05f527cf8886b1c6b9cde1"
 
 SRC_URI = " \
   git://github.com/virt-manager/virt-manager;branch=main;protocol=https \
-  file://0001-setup.py-move-global-args-to-install-args.patch \
+  file://0001-build-drop-man-directory.patch \
 "
 
+PV = "v5.0.0+git"
+
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "gui"
 PACKAGECONFIG[gui] = ",--no-update-icon-cache --no-compile-schemas,python3-pygobject"
 
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'gui', 'gtk-icon-cache', '', d)}
-inherit bash-completion gettext pkgconfig setuptools3_legacy
+inherit bash-completion gettext pkgconfig meson
+
+EXTRA_OEMESON += "-Dupdate-icon-cache=false \
+                   -Dtests=disabled \
+                 "
 
 PACKAGES += " \
   ${PN}-common \
   ${PN}-install \
 "
 
+DEPENDS = "python3-pylint"
+
 RDEPENDS:${PN}-common += " \
   libvirt-python \
   libosinfo \
@@ -32,6 +40,9 @@ RDEPENDS:${PN} = " \
   ${PN}-common \
   libvirt-glib \
   libxml2-python \
+  gdk-pixbuf \
+  gtk+3 \
+  hicolor-icon-theme \
   python3-pygobject \
   python3-requests \
 "