<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/ae218d74e16d8ab8a53e5ea0ee9fb39bf3226a2e">https://github.com/macports/macports-ports/commit/ae218d74e16d8ab8a53e5ea0ee9fb39bf3226a2e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ae218d74e16d8ab8a53e5ea0ee9fb39bf3226a2e
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Thu Sep 28 02:56:24 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: whitespace changes
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 68 ++++++++++++++++++------------------
1 file changed, 34 insertions(+), 34 deletions(-)
<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 fd0ea1f..69313e4 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;'>@@ -618,49 +618,49 @@ pre-destroot {
</span> }
if {![info exists building_qt5]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_installed_name ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_installed_name ""
</span>
<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:#e0ffe0;'>+ 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;'>+ if { [string range ${qt_test_name} end-3 end] eq "-kde" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_test_port_name ${qt_test_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_test_port_name ${qt_test_name}-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active ${qt_test_port_name}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set qt_installed_name ${qt_test_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active ${qt_test_port_name}] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_installed_name ${qt_test_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${qt_installed_name} eq "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "at least one Qt must be installed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "insufficient dependencies"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${qt_installed_name} eq "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "at least one Qt must be installed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "insufficient dependencies"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "qt5 PortGroup: Qt is provided by ${qt_installed_name}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "qt5 PortGroup: Qt is provided by ${qt_installed_name}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_exists qt5kde] && [variant_isset qt5kde] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [string range ${qt_installed_name} end-3 end] ne "-kde" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "qt5 PortGroup: Qt is installed but not qt5-kde, as is required by this variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "qt5 PortGroup: please run `sudo port uninstall --follow-dependents ${qt_installed_name}-qtbase and try again"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "improper Qt installed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${qt_installed_name} ne [qt5.get_default_name] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://wiki.qt.io/Qt-Version-Compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "qt5 PortGroup: default Qt for this platform is [qt5.get_default_name] but ${qt_installed_name} is installed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${qt_installed_name} ne "qt5" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Qt dependency is not the latest version but may be the latest supported on your OS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Qt dependency is not supported on this platform and may not build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_exists qt5kde] && [variant_isset qt5kde] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [string range ${qt_installed_name} end-3 end] ne "-kde" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "qt5 PortGroup: Qt is installed but not qt5-kde, as is required by this variant"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "qt5 PortGroup: please run `sudo port uninstall --follow-dependents ${qt_installed_name}-qtbase and try again"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "improper Qt installed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${qt_installed_name} ne [qt5.get_default_name] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://wiki.qt.io/Qt-Version-Compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "qt5 PortGroup: default Qt for this platform is [qt5.get_default_name] but ${qt_installed_name} is installed"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${qt_installed_name} ne "qt5" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Qt dependency is not the latest version but may be the latest supported on your OS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Qt dependency is not supported on this platform and may not build"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
# add qt5kde variant if one does not exist and one is requested via qt5.using_kde
# variant is added in eval_variants so that qt5.using_kde can be set anywhere in the Portfile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -748,5 +748,5 @@ namespace eval qt5pg {
</span> }
if {![info exists building_qt5]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-port::register_callback qt5pg::register_dependents
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port::register_callback qt5pg::register_dependents
</span> }
</pre><pre style='margin:0'>
</pre>