<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/7b8af4dc9cda436c6129d426bf56fb6d2dab2ece">https://github.com/macports/macports-ports/commit/7b8af4dc9cda436c6129d426bf56fb6d2dab2ece</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7b8af4dc9cda436c6129d426bf56fb6d2dab2ece
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Sat May 19 08:21:37 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> qt5: use Qt 5.9 on OS X 10.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Qt 5.9 is the last version of Qt to officially support OS X 10.10.
</span><span style='display:block; white-space:pre;color:#404040;'> QtWebEngine is known not to work.
</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/55651
</span>---
_resources/port1.0/group/qt5-1.0.tcl | 4 ++--
aqua/qt5/Portfile | 14 +++++++++++---
aqua/qt59/Portfile | 5 +++++
3 files changed, 18 insertions(+), 5 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 42fe857..d805dc8 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;'>@@ -87,13 +87,13 @@ proc qt5.get_default_name {} {
</span> #
# OS X Yosemite (10.10)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Qt 5.10: Not Supported but seems to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Qt 5.10: Not Supported and QtWebEngine fails
</span> # Qt 5.9: Supported
# Qt 5.8: Supported
# Qt 5.7: Supported
# Qt 5.6: Supported
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return qt59
</span> #
} elseif { ${os.major} == 15 } {
#
<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 fbcada9..62d66cb 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;'>@@ -1763,15 +1763,23 @@ foreach {component component_info} [array get qt5pg::qt5_component_lib] {
</span> # Qt 5.7 will not work on Mac OS X 10.7
# Qt 5.8 will not work on Mac OS X 10.8
# Qt 5.9 will not work on Mac OS X 10.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# replace qt5-XYZ port with qt5{6,7,8}-XYZ port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt 5.10 will not work on Mac OS X 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace qt5-XYZ port with qt5{6,7,8,9}-XYZ port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 15} {
</span>
if { ${os.major} < 12 } {
set qt_replace_version 5.6
} elseif { ${os.major} < 13 } {
set qt_replace_version 5.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} < 14 } {
</span> set qt_replace_version 5.8
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set qt_replace_version 5.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${version} eq "5.10.1"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # increase revision for replaced_by to work
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not force *all* OSs to rebuild
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision [incr ${revision}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
set qt_replace_name qt[join [split ${qt_replace_version} .] ""]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt59/Portfile b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7f776b5..7975654 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt59/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,6 +50,11 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# qt59-qtbase replaces qt5-qtbase, so can not conflict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} == 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts-delete qt5-qtbase
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> ############################################################################### Modules Not Considered
#
# No qtactiveqt (Windows Only)
</pre><pre style='margin:0'>
</pre>