<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/74be8493959b1f2b3a68b277ee66217e4f880014">https://github.com/macports/macports-ports/commit/74be8493959b1f2b3a68b277ee66217e4f880014</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 74be849 qt5-qtdeclarative: fix upgrade procedure
</span>74be849 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 74be8493959b1f2b3a68b277ee66217e4f880014
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Mar 17 19:31:09 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtdeclarative: fix upgrade procedure
</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/53789
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
</span>---
aqua/qt5/Portfile | 13 +++++++++++++
1 file changed, 13 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/Portfile b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c7b9853..073ab22 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1720,3 +1720,16 @@ if { ${os.major} < 12 } {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/53789
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${subport} eq "qt5-qtdeclarative" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active qt5-qtquickcontrols] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_version 5.7] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite qt5-qtquickcontrols "" [list ports_nodepcheck 1]
</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;'>+}
</span></pre><pre style='margin:0'>
</pre>