<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/565623c598c66fe27cd0e7313ab2b49e1af7da9d">https://github.com/macports/macports-ports/commit/565623c598c66fe27cd0e7313ab2b49e1af7da9d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 565623c598c66fe27cd0e7313ab2b49e1af7da9d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jun 3 14:44:36 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> virt-manager: Update to 4.0.0
</span>---
gnome/virt-manager/Portfile | 31 +++++++++++-----------
gnome/virt-manager/files/install.patch | 22 +++++++++++++++
gnome/virt-manager/files/patch-no-kvm-warning.diff | 6 ++---
.../virt-manager/files/patch-setup.py-rst2man.diff | 14 ----------
gnome/virt-manager/files/setuptools-61.patch | 22 +++++++++++++++
5 files changed, 63 insertions(+), 32 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 028faa4941f..5ae5c9912f9 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;'>@@ -6,15 +6,19 @@ PortGroup github 1.0
</span> PortGroup active_variants 1.1
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup virt-manager virt-manager 3.2.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup virt-manager virt-manager 4.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 edfe78b9e1c4fa9d288834a24dd49bdf96a246ae \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 515aaa2021a4bf352b0573098fe6958319b1ba8ec508ea37e064803f97f17086 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3096236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories gnome emulators
supported_archs noarch
maintainers nomaintainer
license GPL-2+
homepage https://virt-manager.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://releases.pagure.org/virt-manager/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://releases.pagure.org/virt-manager/
</span>
description Virtual Machine Manager
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,17 +31,12 @@ 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;'>-checksums rmd160 7a7900c1c8521938408653f4a609716c1a561d64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2858909
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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-setup.py-rst2man.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append install.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append setuptools-61.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.default_version 39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.default_version 310
</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.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +46,7 @@ depends_build \
</span> path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
port:python${python.version} \
port:py${python.version}-docutils \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span> path:lib/pkgconfig/glib-2.0.pc:glib2
depends_run \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ app.use_launch_script yes
</span>
use_configure yes
configure.cmd ${build.cmd} configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --prefix ${python.prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args --prefix ${python.prefix}
</span>
set virtmgr_python_replace \
[list virt-clone virt-install virt-manager virt-xml]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,6 @@ post-patch {
</span> reinplace "s|/usr/bin/env python3|${python.bin}|" \
${worksrcpath}/${f}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- unset f
</span>
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/virtManager/createconn.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +90,10 @@ pre-configure {
</span> ${workpath}/virt-manager.sh
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env "PATH=${python.prefix}/bin:$env(PATH)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set virtmgr_deps_validate \
[list cairo glib2 gtk3 librsvg pango py${python.version}-cairo spice-gtk gtksourceview4]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +103,6 @@ variant quartz conflicts x11 {
</span> #foreach dep ${virtmgr_deps_validate} {
# require_active_variants $dep quartz x11
#}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #unset dep
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +111,6 @@ variant x11 conflicts quartz {
</span> #foreach dep ${virtmgr_deps_validate} {
# require_active_variants $dep x11 quartz
#}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #unset dep
</span> }
if {![variant_isset quartz] && ![variant_isset x11]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/install.patch b/gnome/virt-manager/files/install.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bc6fec4f7a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/virt-manager/files/install.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install files before trying to update the icon cache or compile the schemas.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/virt-manager/virt-manager/issues/400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2022-02-12 10:13:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2022-06-03 14:36:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,6 +264,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ setuptools.command.install.install.finalize_options(self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def run(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ setuptools.command.install.install.run(self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not self.distribution.no_update_icon_cache:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print("running gtk-update-icon-cache")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ icon_path = os.path.join(self.install_data, "share/icons/hicolor")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -275,8 +277,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "share/glib-2.0/schemas")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self.spawn(["glib-compile-schemas", gschema_install])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- setuptools.command.install.install.run(self)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Custom commands #
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/patch-no-kvm-warning.diff b/gnome/virt-manager/files/patch-no-kvm-warning.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dfff2757319..89468dd95d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/files/patch-no-kvm-warning.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/virt-manager/files/patch-no-kvm-warning.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- virtManager/createvm.py 2020-11-14 16:07:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ virtManager/createvm.py.new 2021-06-07 10:59:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- virtManager/createvm.py.orig 2022-02-12 10:13:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ virtManager/createvm.py 2022-06-02 19:31:22.000000000 -0500
</span> @@ -7,6 +7,7 @@
import io
import pkgutil
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@
</span> import threading
import time
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -594,7 +595,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -602,7 +603,8 @@
</span> uiutil.set_grid_row_visible(self.widget("arch-expander"), show_arch)
if self.conn.is_qemu():
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/patch-setup.py-rst2man.diff b/gnome/virt-manager/files/patch-setup.py-rst2man.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b2e06a76db3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/files/patch-setup.py-rst2man.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;'>---- setup.py 2021-06-07 08:46:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py.new 2021-06-07 08:46:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -162,9 +162,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def _make_man_pages(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils.spawn import find_executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rstbin = find_executable("rst2man")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rstbin = find_executable("rst2man-3.9")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not rstbin:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rstbin = find_executable("rst2man.py")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rstbin = find_executable("rst2man-3.9.py")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not rstbin:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.exit("Didn't find rst2man or rst2man.py")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/setuptools-61.patch b/gnome/virt-manager/files/setuptools-61.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7f1d0c3824b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/virt-manager/files/setuptools-61.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+setup: add bits for setuptools-61
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Quoting https://github.com/pypa/setuptools/issues/3227
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"Setuptools >= 61, intentionally changes the way packages are built in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sensec that it will try to find files and fail if something is weird.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Empty packages (like this one), are asked to explicitly add packages=[]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ to their configuration.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This intentional change in behaviour is described in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://setuptools.pypa.io/en/latest/history.html#v61-0-0."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.gentoo.org/836645
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -547,4 +547,5 @@ def run(self):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distclass=VMMDistribution,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ packages=[],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span></pre><pre style='margin:0'>
</pre>