<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/6f659bbad97d5e2d511f77efdd3f6847b1568cbd">https://github.com/macports/macports-ports/commit/6f659bbad97d5e2d511f77efdd3f6847b1568cbd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6f659bbad97d5e2d511f77efdd3f6847b1568cbd
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Dec 11 04:22:05 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5, qt58: remove unreachable version checking code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Early in the Portfile, pre-fetch exits if os.major < 14.
</span><span style='display:block; white-space:pre;color:#404040;'> There is no reason to check again later.
</span><span style='display:block; white-space:pre;color:#404040;'> This is leftover code from previous versions.
</span>---
aqua/qt5/Portfile | 19 ++-----------------
aqua/qt58/Portfile | 11 ++---------
2 files changed, 4 insertions(+), 26 deletions(-)
<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 b9661d8..27eb3c6 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;'>@@ -491,7 +491,7 @@ array set modules {
</span> ""
"qtquickcontrols qtwebchannel qtlocation qttools"
{"Qt WebEngine"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "very large and relatively new; requires newer version of OS X"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "very large and relatively new"
</span> "variant overrides: "
"revision 0"
"License: "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1211,9 +1211,7 @@ foreach {module module_info} [array get modules] {
</span> # requires qtdoc depend on all the documentation modules
foreach {module_doc module_doc_info} [array get modules] {
if { [lsearch -exact [lindex ${module_doc_info} 7] "~docs"] == -1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 13 || (${module_doc} ne "qtwebengine" && ${module_doc} ne "qtwebview" && ${module_doc} ne "qtnetworkauth") } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}-${module_doc}-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-${module_doc}-docs
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1302,19 +1300,6 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtwebengine" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup xcodeversion 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 6.1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.9 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} == 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://bugreports.qt.io/browse/QTBUG-54486
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version 10.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see http://lists.qt-project.org/pipermail/interest/2016-February/thread.html#20946
# see http://googleappsupdates.blogspot.co.uk/2014/09/google-chrome-64-bit-for-mac-and-windows.html
# see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt58/Portfile b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c03f771..2ccba8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt58/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1221,9 +1221,7 @@ foreach {module module_info} [array get modules] {
</span> # requires qtdoc depend on all the documentation modules
foreach {module_doc module_doc_info} [array get modules] {
if { [lsearch -exact [lindex ${module_doc_info} 7] "~docs"] == -1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 13 || (${module_doc} ne "qtwebengine" && ${module_doc} ne "qtwebview") } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}-${module_doc}-docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-${module_doc}-docs
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1309,12 +1307,7 @@ foreach {module module_info} [array get modules] {
</span> # see http://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
minimum_xcodeversions {13 5.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} requires OS X 10.9 or later"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} == 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} == 13 } {
</span> # see https://bugreports.qt.io/browse/QTBUG-54486
configure.sdk_version 10.10
}
</pre><pre style='margin:0'>
</pre>