<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/698da1da7bad23d20c4472547e5554d17ce9ca6c">https://github.com/macports/macports-ports/commit/698da1da7bad23d20c4472547e5554d17ce9ca6c</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 698da1da7ba virt-manager: add app bundle; adjust description; fix dependencies
</span>698da1da7ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 698da1da7bad23d20c4472547e5554d17ce9ca6c
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sun Jun 7 15:56:14 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> virt-manager: add app bundle; adjust description; fix dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This necessitated fixing a bug in the `app` group where it didn't
</span><span style='display:block; white-space:pre;color:#404040;'> handle spaces in paths.
</span>---
_resources/port1.0/group/app-1.0.tcl | 4 +--
gnome/virt-manager/Portfile | 47 ++++++++++++++++++++++----------
gnome/virt-manager/files/virt-manager.sh | 3 ++
3 files changed, 37 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/app-1.0.tcl b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 379c3b8c48b..a1e63b623cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,13 +279,13 @@ platform macosx {
</span> return -code error "app.icon ${app.icon} could not be converted to png: $::errorInfo"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns $makeicnsargs -out ${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns 2>@1"}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns $makeicnsargs -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>@1"}]} {
</span> return -code error "app.icns could not be created: $::errorInfo"
}
# If app.icon is another type of image file, convert it.
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns -in ${icon} -out ${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns 2>@1"}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[catch {system -W ${worksrcpath} "${prefix}/bin/makeicns -in ${icon} -out \"${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns\" 2>@1"}]} {
</span> return -code error "app.icon ${app.icon} could not be converted to ${app.name}.icns: $::errorInfo"
}
}
<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 6c8d86f0911..4d7f7751656 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;'>@@ -4,9 +4,10 @@ PortSystem 1.0
</span> PortGroup python 1.0
PortGroup github 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup app 1.0
</span>
github.setup virt-manager virt-manager 2.2.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories gnome emulators
supported_archs noarch
maintainers {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,19 +16,16 @@ license GPL-2+
</span> homepage https://virt-manager.org
master_sites http://releases.pagure.org/virt-manager/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description Desktop tool for managing virtual machines via libvirt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Virtual Machine Manager
</span>
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- The virt-manager application is a GNOME desktop user interface for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- managing virtual machines through libvirt. It primarily targets \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Linux KVM VMs, but also manages Xen and LXC (linux containers). It \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- presents a summary view of running domains, their live performance \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- & resource utilization statistics. Wizards enable the creation of \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- new domains, and configuration & adjustment of a domain’s resource \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allocation & virtual hardware. An embedded VNC and SPICE client \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- viewer presents a full graphical console to the guest domain. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The primary use on macOS is for remote administration of Linux boxes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virt-manager is a graphical tool for managing virtual machines via \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libvirt. Most usage is with QEMU/KVM virtual machines, but Xen and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libvirt LXC containers are well supported. Common operations for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ any libvirt driver should work. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n\nExpect limited functionality as macOS is not the usual \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform for this application\; its primary use on macOS is for \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ remote administration of Linux boxes.
</span>
checksums rmd160 9c06e912feb3f44f0ba4b50d94b22118106d380e \
sha256 cfd88d66e834513e067b4d3501217e21352fadb673103bacb9e646da9f029a1b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,6 +42,7 @@ post-patch {
</span>
depends_build \
port:intltool \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk2 \
</span> port:python${python.version} \
bin:podman:perl5 \
path:lib/pkgconfig/glib-2.0.pc:glib2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,20 +54,38 @@ depends_run \
</span> port:libvirt-glib \
port:vte \
port:gtk-vnc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtk3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtksourceview4 \
</span> port:spice-gtk \
port:libosinfo
<span style='display:block; white-space:pre;background:#e0ffe0;'>+app.name Virtual Machine Manager
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.executable ${workpath}/virt-manager.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon data/icons/256x256/apps/virt-manager.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+app.use_launch_script yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure yes
configure.cmd ${build.cmd} configure
configure.args --prefix ${python.prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set depspecs [list cairo glib2 gtk3 librsvg pango py${python.version}-cairo spice-gtk gtksourceview4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dep ${depspecs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants $dep quartz x11
</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;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/virt-manager.sh ${workpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s+@PREFIX@+${prefix}+ ${workpath}/virt-manager.sh
</span> }
variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dep $depspecs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg $dep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants $dep x11 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
depends_run-append path:bin/Xquartz:xorg-server
}
<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>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4eef8ac9879
</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/virt-manager.sh
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/bin/sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+exec @PREFIX@/bin/virt-manager --no-fork "$@"
</span></pre><pre style='margin:0'>
</pre>