<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cc604cc34f79c267b4d27454f61256e65ba89ee6">https://github.com/macports/macports-ports/commit/cc604cc34f79c267b4d27454f61256e65ba89ee6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cc604cc34f79c267b4d27454f61256e65ba89ee6
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Thu Sep 28 03:11:23 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: add extra info to available_qt_versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> available_qt_versions variable now includes the Qt version
</span><span style='display:block; white-space:pre;color:#404040;'> and the name of the port that provides qtbase.
</span>---
_resources/port1.0/group/qmake5-1.0.tcl | 8 ++------
_resources/port1.0/group/qt5-1.0.tcl | 21 ++++++++-------------
aqua/qt5/Portfile | 10 +++-------
aqua/qt55/Portfile | 10 +++-------
aqua/qt56/Portfile | 10 +++-------
aqua/qt57/Portfile | 10 +++-------
6 files changed, 22 insertions(+), 47 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qmake5-1.0.tcl b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 774abe7..863dca0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qmake5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -178,12 +178,8 @@ pre-configure {
</span>
# accommodating variant request varies depending on how qtbase was built
set base_debug false
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach qt_test_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range ${qt_test_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_test_port_name ${qt_test_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_test_port_name ${qt_test_name}-qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_test_port_name [lindex ${qt_test_info} 0]
</span> if {![catch {set result [active_variants ${qt_test_port_name} debug ""]}]} {
if {$result} {
# code to be executed if $depspec is active with at least all variants in
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/qt5-1.0.tcl b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 69313e4..d7c580d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/qt5-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,12 +37,13 @@
</span> options qt5.using_kde qt5.base_version
global available_qt_versions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set available_qt_versions {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt55
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+array set available_qt_versions {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5 {qt5-qtbase 5.8}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt57 {qt57-qtbase 5.7}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt56 {qt56-qtbase 5.6}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt55 {qt55-qtbase 5.5}
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#qt5-kde {qt5-kde 5.8}
</span>
proc qt5.get_default_name {} {
global os.major cxx_stdlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -621,14 +622,8 @@ if {![info exists building_qt5]} {
</span> pre-configure {
set qt_installed_name ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach qt_test_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range ${qt_test_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_test_port_name ${qt_test_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_test_port_name ${qt_test_name}-qtbase
</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:#e0ffe0;'>+ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_test_port_name [lindex ${qt_test_info} 0]
</span> if {![catch {set installed [lindex [registry_active ${qt_test_port_name}] 0]}]} {
set qt_installed_name ${qt_test_name}
}
<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 d8bab0b..a31eaf3 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;'>@@ -39,13 +39,9 @@ if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
</span>
conflicts qt3 qt3-mac
# conflict with all other version of qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach test_qt_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${name} ne ${test_qt_name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range ${test_qt_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} ne ${qt_test_name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append [lindex ${qt_test_info} 0]
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07a7175..c52e9bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,13 +41,9 @@ if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
</span>
conflicts qt3 qt3-mac
# conflict with all other version of qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach test_qt_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${name} ne ${test_qt_name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range ${test_qt_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} ne ${qt_test_name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append [lindex ${qt_test_info} 0]
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt56/Portfile b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15de374..627d496 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt56/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,13 +42,9 @@ if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
</span>
conflicts qt3 qt3-mac
# conflict with all other version of qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach test_qt_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${name} ne ${test_qt_name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range ${test_qt_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} ne ${qt_test_name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append [lindex ${qt_test_info} 0]
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt57/Portfile b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 996d0ff..71d2978 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,13 +42,9 @@ if { ${subport} ne ${name} && ${subport} ne "${name}-docs" } {
</span>
conflicts qt3 qt3-mac
# conflict with all other version of qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach test_qt_name ${available_qt_versions} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${name} ne ${test_qt_name} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range ${test_qt_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-append ${test_qt_name}-qtbase
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${name} ne ${qt_test_name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-append [lindex ${qt_test_info} 0]
</span> }
}
</pre><pre style='margin:0'>
</pre>