<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/a22f50c074411ead38c951d28dd92bbaaee27b77">https://github.com/macports/macports-ports/commit/a22f50c074411ead38c951d28dd92bbaaee27b77</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a22f50c074411ead38c951d28dd92bbaaee27b77
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sat Jun 20 16:06:36 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> virt-manager: don't warn about KVM; fix paths
</span>---
gnome/virt-manager/Portfile | 8 +++++++-
gnome/virt-manager/files/no-kvm-warning.diff | 21 +++++++++++++++++++++
gnome/virt-manager/files/not-in-usr.diff | 26 ++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 1 deletion(-)
<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 819f5668a66..8f74a591783 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;'>@@ -7,7 +7,7 @@ PortGroup active_variants 1.1
</span> PortGroup app 1.0
github.setup virt-manager virt-manager 2.2.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories gnome emulators
supported_archs noarch
maintainers {danchr @danchr} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,11 +33,17 @@ checksums rmd160 9c06e912feb3f44f0ba4b50d94b22118106d380e \
</span>
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles no-kvm-warning.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ not-in-usr.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> python.default_version 37
post-patch {
reinplace -W ${worksrcpath} "s|/usr/bin/env python3|${python.bin}|" \
virt-clone virt-convert virt-install virt-manager virt-xml
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} "s|@PREFIX@|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ virtManager/createconn.py
</span> }
depends_build \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/no-kvm-warning.diff b/gnome/virt-manager/files/no-kvm-warning.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c2c774730cf
</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/no-kvm-warning.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git virtManager/createvm.py virtManager/createvm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- virtManager/createvm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ virtManager/createvm.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import io
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import pkgutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import os
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import threading
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -609,7 +610,8 @@ class vmmCreateVM(vmmGObjectUI):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self._show_startup_warning(error)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elif self.conn.is_qemu():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if not self._capsinfo.guest.is_kvm_available():
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sys.platform == 'linux' and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ not self._capsinfo.guest.is_kvm_available()):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error = _("KVM is not available. This may mean the KVM "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "package is not installed, or the KVM kernel modules "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "are not loaded. Your virtual machines may perform poorly.")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/files/not-in-usr.diff b/gnome/virt-manager/files/not-in-usr.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a6c779a031c
</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/not-in-usr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git virtManager/createconn.py virtManager/createconn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- virtManager/createconn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ virtManager/createconn.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,15 +65,15 @@ class vmmCreateConn(vmmGObjectUI):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os.path.exists("/proc/xen")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 'xen:///'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (os.path.exists("/usr/bin/qemu") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.path.exists("/usr/bin/qemu-kvm") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.path.exists("/usr/bin/kvm") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.path.exists("/usr/libexec/qemu-kvm") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glob.glob("/usr/bin/qemu-system-*")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (os.path.exists("@PREFIX@/bin/qemu") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.path.exists("@PREFIX@/bin/qemu-kvm") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.path.exists("@PREFIX@/bin/kvm") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.path.exists("@PREFIX@/libexec/qemu-kvm") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glob.glob("@PREFIX@/bin/qemu-system-*")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "qemu:///system"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (os.path.exists("/usr/lib/libvirt/libvirt_lxc") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- os.path.exists("/usr/lib64/libvirt/libvirt_lxc")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (os.path.exists("@PREFIX@/lib/libvirt/libvirt_lxc") or
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ os.path.exists("@PREFIX@/lib64/libvirt/libvirt_lxc")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "lxc:///"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>