<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bef18d1ed503a70cd428451bc32ce1e7b46de7ae">https://github.com/macports/macports-ports/commit/bef18d1ed503a70cd428451bc32ce1e7b46de7ae</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bef18d1ed50 virt-manager: update to 5.0.0
</span>bef18d1ed50 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bef18d1ed503a70cd428451bc32ce1e7b46de7ae
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Sat Dec 21 11:14:41 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> virt-manager: update to 5.0.0
</span>---
gnome/virt-manager/Portfile | 110 +++++++--------------
.../files/patch-gtk-update-icon-cache.diff | 14 ---
gnome/virt-manager/files/patch-hvf-support.diff | 36 -------
gnome/virt-manager/files/virt-manager.sh | 4 -
4 files changed, 37 insertions(+), 127 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/Portfile b/gnome/virt-manager/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ad3c39da83..df44b59e621 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/virt-manager/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup python 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup meson 1.0
</span> PortGroup github 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup app 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup virt-manager virt-manager 4.1.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 75b773577e04827d808cc85f3a781d1135026215 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 950681d7b32dc61669278ad94ef31da33109bf6fcf0426ed82dfd7379aa590a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3151412
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup virt-manager virt-manager 5.0.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a913e936314049a662b18b647ecc36b4631335c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bc89ae46e0c997bd754ed62a419ca39c6aadec27e3d8b850cea5282f0083f84a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1466724
</span>
categories gnome emulators
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,6 @@ maintainers {makr @mohd-akram} openmaintainer
</span> license GPL-2+
homepage https://virt-manager.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://releases.pagure.org/virt-manager/
</span>
description Virtual Machine Manager
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,28 +31,29 @@ long_description \
</span> platform for this application\; its primary use on macOS is for \
remote administration of Linux boxes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gtk-update-icon-cache.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://releases.pagure.org/virt-manager/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append patch-no-kvm-warning.diff
patchfiles-append patch-not-in-usr.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-hvf-support.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-python.pep517 no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver 3.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver_nodot [string map {. {}} ${py_ver}]
</span>
# Note: 'gettext' only needed at build time. No need for a runtime dep on
# 'gettext-runtime', as this port utilizes Python's built-in 'gettext' support.
depends_build \
port:gettext \
path:bin/glib-compile-schemas:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${python.version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-docutils \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-gobject3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-libvirt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-libxml2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-requests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-docutils
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-gobject3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-libvirt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-requests \
</span> port:libvirt-glib \
port:vte \
port:gtk-vnc \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,69 +63,33 @@ depends_run \
</span> port:libosinfo
app.name Virtual Machine Manager
<span style='display:block; white-space:pre;background:#ffe0e0;'>-app.executable ${workpath}/virt-manager.sh
</span> app.icon data/icons/256x256/apps/virt-manager.png
app.use_launch_script yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ${build.cmd} configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.pre_args --prefix ${python.prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set virtmgr_python_replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [list virt-clone virt-install virt-manager virt-xml]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach f ${virtmgr_python_replace} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env python3|${python.bin}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/virtManager/createconn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|'python3'|'${prefix}/bin/python${py_ver}'|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/bin/env python3|${prefix}/bin/python${py_ver}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/scripts/make_bin_wrapper.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|'rst2man'|'rst2man-${py_ver}'|" ${worksrcpath}/man/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/virtManager/createconn.py
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/virt-manager.sh ${workpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${workpath}/virt-manager.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env "PATH=${python.prefix}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env {*}${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+To be able to run VMs locally via QEMU, first run:
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set virtmgr_deps_validate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [list cairo glib2 gtk3 librsvg pango py${python.version}-cairo spice-gtk gtksourceview4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo port install qemu libvirt +qemu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+sudo port load dbus
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant quartz conflicts x11 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: Based on testing, this strictness isn't needed. But keep just-in-case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #foreach dep ${virtmgr_deps_validate} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # require_active_variants $dep quartz x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 conflicts quartz {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: Based on testing, this strictness isn't needed. But keep just-in-case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #foreach dep ${virtmgr_deps_validate} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # require_active_variants $dep x11 quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set result [active_variants gtk3 quartz x11]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In ${name}, add a connection and set the hypervisor to QEMU/KVM user session.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span>
# stubs for checking dependencies in trace mode
#test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#test.cmd ${python.bin} virt-manager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.cmd ${prefix}/bin/python${py_ver} virt-manager
</span> #test.args
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/patch-gtk-update-icon-cache.diff b/gnome/virt-manager/files/patch-gtk-update-icon-cache.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b8c89c33290..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/files/patch-gtk-update-icon-cache.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-In MacPorts gtk-update-icon-cache is provided by the gtk2 port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gtk3 provides gtk-update-icon-cache-3.0 instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -269,7 +269,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not self.distribution.no_update_icon_cache:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print("running gtk-update-icon-cache")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- icon_path = os.path.join(self.install_data, "share/icons/hicolor")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.spawn(["gtk-update-icon-cache-3.0", "-q", "-t", icon_path])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not self.distribution.no_compile_schemas:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print("compiling gsettings schemas")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/patch-hvf-support.diff b/gnome/virt-manager/files/patch-hvf-support.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e657937e312..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/files/patch-hvf-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 9357536a087750c5865c873aa5f77ddb2a96c24c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Mohamed Akram <mohd.akram@outlook.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 17 Sep 2023 17:34:22 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Add support for hvf domain type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtManager/connection.py | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtinst/capabilities.py | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 3 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/virtManager/connection.py b/virtManager/connection.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8e7df402e..a052cdf82 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- virtManager/connection.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ virtManager/connection.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -220,6 +220,8 @@ def pretty_hv(gtype, domtype):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- label = "QEMU TCG"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif domtype == "kvm":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- label = "KVM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elif domtype == "hvf":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ label = "Hypervisor.framework"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return label
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/virtinst/capabilities.py b/virtinst/capabilities.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 533c0d9a4..5549a65ce 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- virtinst/capabilities.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ virtinst/capabilities.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -236,7 +236,7 @@ def _bestDomainType(self, guest, dtype, machine):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not domains:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- priority = ["kvm", "xen", "qemu"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ priority = ["kvm", "xen", "hvf", "qemu"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for t in priority:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for d in domains:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/virt-manager.sh b/gnome/virt-manager/files/virt-manager.sh
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index f8bccd0205a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/files/virt-manager.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PATH=@PREFIX@/bin:@PREFIX@/sbin:${PATH:-$(/usr/bin/getconf PATH)}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec @PREFIX@/bin/virt-manager --no-fork "$@"
</span></pre><pre style='margin:0'>
</pre>