<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/09fb5ed1bba624342bfdbc7781c7eeb405cb2050">https://github.com/macports/macports-ports/commit/09fb5ed1bba624342bfdbc7781c7eeb405cb2050</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 09fb5ed virt-manager: fix default variant detection
</span>09fb5ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 09fb5ed1bba624342bfdbc7781c7eeb405cb2050
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Sun Jun 7 15:48:53 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> virt-manager: fix default variant detection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/60613
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/60612
</span>---
gnome/virt-manager/Portfile | 12 ++++++++----
1 file changed, 8 insertions(+), 4 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 6202291..6c8d86f 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;'>@@ -73,11 +73,15 @@ variant x11 conflicts quartz {
</span> depends_run-append path:bin/Xquartz:xorg-server
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset x11] && ![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants gtk2 x11 quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset quartz] && ![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants gtk3 quartz x11]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {![variant_isset quartz]} {
</span> default_variants +x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +quartz
</span> }
}
</pre><pre style='margin:0'>
</pre>