<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/703c236e496a3b02a63ffeb89eed7af3427750c8">https://github.com/macports/macports-ports/commit/703c236e496a3b02a63ffeb89eed7af3427750c8</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 703c236 qt5 PG: modify warnings for different configurations
</span>703c236 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 703c236e496a3b02a63ffeb89eed7af3427750c8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Jan 5 11:20:18 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5 PG: modify warnings for different configurations
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 57 +++++++++++++++++++++++++++---------
1 file changed, 43 insertions(+), 14 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 afbf445..1714ed9 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;'>@@ -283,20 +283,6 @@ if { ![option universal_variant] || ![variant_isset universal] } {
</span> set qt_qmake_spec ""
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not try to install if qt5-qtbase dependency will fail to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# warn about non-reference configurations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</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:#ffe0e0;'>- }
</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:#ffe0e0;'>-if { ${qt_name} ne "qt5" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</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;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {![info exists building_qt5]} {
depends_lib-append path:lib/pkgconfig/Qt5Core.pc:${qt_name}-qtbase
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -313,3 +299,46 @@ if { ![option universal_variant] || ![variant_isset universal] } {
</span> lappend merger_destroot_env($arch) INSTALL_ROOT=${workpath}/destroot-${arch}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+
</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:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>