<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d045e9b884def50a00f35987a9b304e3ec42754f">https://github.com/macports/macports-ports/commit/d045e9b884def50a00f35987a9b304e3ec42754f</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 d045e9b884d virt-manager: update to 4.1.0
</span>d045e9b884d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d045e9b884def50a00f35987a9b304e3ec42754f
</span>Author: Dennis Camera <dennis.camera@riiengineering.ch>
AuthorDate: Wed May 24 10:51:53 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> virt-manager: update to 4.1.0
</span>---
gnome/virt-manager/Portfile | 16 +++++++---------
gnome/virt-manager/files/install.patch | 22 ----------------------
.../files/patch-gtk-update-icon-cache.diff | 14 ++++++++++++++
gnome/virt-manager/files/setuptools-61.patch | 22 ----------------------
4 files changed, 21 insertions(+), 53 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 2f3aa69b0aa..1d30bcac947 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,11 +6,11 @@ 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 4.0.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 edfe78b9e1c4fa9d288834a24dd49bdf96a246ae \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 515aaa2021a4bf352b0573098fe6958319b1ba8ec508ea37e064803f97f17086 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3096236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup virt-manager virt-manager 4.1.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 75b773577e04827d808cc85f3a781d1135026215 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 950681d7b32dc61669278ad94ef31da33109bf6fcf0426ed82dfd7379aa590a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3151412
</span>
categories gnome emulators
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,10 +31,9 @@ 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:#e0ffe0;'>+patchfiles-append patch-gtk-update-icon-cache.diff
</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 install.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append setuptools-61.patch
</span>
python.default_version 310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +42,10 @@ python.default_version 310
</span> depends_build \
port:gettext \
port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/glib-compile-schemas:glib2 \
</span> port:python${python.version} \
port:py${python.version}-docutils \
port:py${python.version}-setuptools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2
</span>
depends_run \
port:py${python.version}-gobject3 \
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bc6fec4f7a0..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/files/install.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Install files before trying to update the icon cache or compile the schemas.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/virt-manager/virt-manager/issues/400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2022-02-12 10:13:59.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2022-06-03 14:36:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -264,6 +264,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setuptools.command.install.install.finalize_options(self)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def run(self):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ setuptools.command.install.install.run(self)
</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_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;'>-@@ -275,8 +277,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "share/glib-2.0/schemas")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.spawn(["glib-compile-schemas", gschema_install])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- setuptools.command.install.install.run(self)
</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;'>- # Custom commands #
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b8c89c33290
</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/patch-gtk-update-icon-cache.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In MacPorts gtk-update-icon-cache is provided by the gtk2 port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gtk3 provides gtk-update-icon-cache-3.0 instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+@@ -269,7 +269,7 @@
</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;'>+- self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self.spawn(["gtk-update-icon-cache-3.0", "-q", "-t", icon_path])
</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_compile_schemas:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print("compiling gsettings schemas")
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f1d0c3824b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/files/setuptools-61.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-setup: add bits for setuptools-61
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Quoting https://github.com/pypa/setuptools/issues/3227
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"Setuptools >= 61, intentionally changes the way packages are built in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sensec that it will try to find files and fail if something is weird.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Empty packages (like this one), are asked to explicitly add packages=[]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- to their configuration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This intentional change in behaviour is described in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- https://setuptools.pypa.io/en/latest/history.html#v61-0-0."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.gentoo.org/836645
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474
</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;'>-@@ -547,4 +547,5 @@ def run(self):
</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;'>- distclass=VMMDistribution,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ packages=[],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span></pre><pre style='margin:0'>
</pre>