<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/47d3194876f3396782e330e7fea9f2a87bba9b57">https://github.com/macports/macports-ports/commit/47d3194876f3396782e330e7fea9f2a87bba9b57</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 47d3194876f3396782e330e7fea9f2a87bba9b57
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Jul 29 20:01:09 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt(56|57|58)-qtwebengine: requires Xcode 6.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Only Xcode 6.1 and later provide macOS 10.10 SDK.
</span><span style='display:block; white-space:pre;color:#404040;'> This reverts commit bea7b4ee30fb481c65726326629b0060bbc1b58a.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt56/Portfile | 17 +++++++++++------
aqua/qt57/Portfile | 2 +-
aqua/qt58/Portfile | 2 +-
3 files changed, 13 insertions(+), 8 deletions(-)
<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 711646cb6f5..fd5f4349c2a 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;'>@@ -1379,12 +1379,17 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtwebengine" } {
# see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- known_fail yes
</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:#e0ffe0;'>+ minimum_xcodeversions {13 6.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} requires OS X 10.9 or later"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS version"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ${os.major} == 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://bugreports.qt.io/browse/QTBUG-54486
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version 10.10
</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 a8f82fe6e0f..47f521ae1f3 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;'>@@ -1452,7 +1452,7 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtwebengine" } {
# see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minimum_xcodeversions {13 6.1}
</span> platform darwin {
if { ${os.major} < 13 } {
known_fail yes
<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 421498be411..798e40c7493 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;'>@@ -1429,7 +1429,7 @@ foreach {module module_info} [array get modules] {
</span> if { ${module} eq "qtwebengine" } {
# see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- minimum_xcodeversions {13 5.1}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ minimum_xcodeversions {13 6.1}
</span> if { ${os.platform} eq "darwin" && ${os.major} == 13 } {
# see https://bugreports.qt.io/browse/QTBUG-54486
configure.sdk_version 10.10
</pre><pre style='margin:0'>
</pre>