<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/6d9d16432eb8873f1c974cb9afaf47852674ed73">https://github.com/macports/macports-ports/commit/6d9d16432eb8873f1c974cb9afaf47852674ed73</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6d9d16432eb8873f1c974cb9afaf47852674ed73
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Wed Jul 27 12:07:41 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt*: os.platform should be checked before os.major
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/phantomjs-qt/Portfile | 4 ++--
aqua/qt511/Portfile | 8 ++++----
aqua/qt513/Portfile | 8 ++++----
aqua/qt53/Portfile | 24 +++++++++++++-----------
aqua/qt55/Portfile | 10 +++++-----
aqua/qt56/Portfile | 16 ++++++++--------
aqua/qt57/Portfile | 28 +++++++++++++++-------------
aqua/qt58/Portfile | 6 +++---
aqua/qt59/Portfile | 8 ++++----
aqua/qt6/Portfile | 2 +-
10 files changed, 59 insertions(+), 55 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/phantomjs-qt/Portfile b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d83368fe00..a6c6765122c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/phantomjs-qt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +125,7 @@ build.env-append \
</span>
# Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
# see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.7 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,7 +340,7 @@ foreach {module module_info} [array get modules] {
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.platform} eq "darwin" && ${os.major} < 13} {
</span> set cxx_abi " -D_GLIBCXX_USE_CXX11_ABI=0"
} else {
set cxx_abi ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt511/Portfile b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b1b54b0e16..f436d89f177 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt511/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> }
# https://trac.macports.org/ticket/63154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" || ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${xcodeversion} ne "none" || ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# qt511-qtbase replaces qt5-qtbase, so can not conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} == 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} == 15 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -792,7 +792,7 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 15 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.11 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1479,7 +1479,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
minimum_xcodeversions {15 7.3}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 15 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 15 } {
</span> pre-fetch {
ui_error "${subport} requires OS X 10.11 or later"
return -code error "incompatible OS version"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/Portfile b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dfdfa423195..49232682dc8 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> }
# https://trac.macports.org/ticket/63154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" || ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${xcodeversion} ne "none" || ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# qt513-qtbase replaces qt5-qtbase, so can not conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} == 16 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} == 16 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -792,7 +792,7 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 16 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 16 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires macOS 10.12 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1497,7 +1497,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/60080
PortGroup xcodeversion 1.0
minimum_xcodeversions {16 9.0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 16 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 16 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires macOS 10.12 or later"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt53/Portfile b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7d46699ba52..bf66d7868e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt53/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -545,7 +545,7 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
# Qt 5.3 has not been built or tested on 10.5 or less at present on MacPorts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 10 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.6 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -553,7 +553,7 @@ if { ${os.major} < 10 } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} > 13 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} does not build on OS X 10.10 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -644,7 +644,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
# see https://developer.apple.com/reference/security/sslprotocol?language=objc
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 && ![variant_isset openssl] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 12 && ![variant_isset openssl] } {
</span> ui_error "using Secure Transport requires OS X 10.8 or later"
ui_error "please use openssl variant"
return -code error "incompatible variant choice"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -823,7 +823,7 @@ foreach {module module_info} [array get modules] {
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.platform} eq "darwin" && ${os.major} < 13} {
</span> set cxx_abi " -D_GLIBCXX_USE_CXX11_ABI=0"
} else {
set cxx_abi ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1024,12 +1024,14 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/54044
# see https://trac.macports.org/ticket/55195
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on 10.6.8, build against the 10.6.8 SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -sdk macosx10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # untested at present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -sdk macosx
</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} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # on 10.6.8, build against the 10.6.8 SDK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -sdk macosx10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # untested at present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -sdk macosx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
# configure options that don't show up in configure --help
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1236,7 +1238,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} 6] "~docs"] == -1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 12 || (${module_doc} ne "qtwebengine") } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 12 || (${module_doc} ne "qtwebengine") } {
</span> depends_lib-append port:${name}-${module_doc}-docs
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt55/Portfile b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd8151ac1eb..5335343b7e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -608,7 +608,7 @@ build.env-append \
</span>
# Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
# see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.7 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -698,7 +698,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
# see https://developer.apple.com/reference/security/sslprotocol?language=objc
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 && ![variant_isset openssl] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 12 && ![variant_isset openssl] } {
</span> ui_error "using Secure Transport requires OS X 10.8 or later"
ui_error "please use openssl variant"
return -code error "incompatible variant choice"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -837,7 +837,7 @@ foreach {module module_info} [array get modules] {
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.platform} eq "darwin" && ${os.major} < 13} {
</span> set cxx_abi " -D_GLIBCXX_USE_CXX11_ABI=0"
} else {
set cxx_abi ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1242,7 +1242,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} 6] "~docs"] == -1 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 12 || (${module_doc} ne "qtwebengine") } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 12 || (${module_doc} ne "qtwebengine") } {
</span> depends_lib-append port:${name}-${module_doc}-docs
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1344,7 +1344,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://doc.qt.io/qt-5/qtwebengine-platform-notes.html
PortGroup xcodeversion 1.0
minimum_xcodeversions {12 5.1}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 12 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.8 or later"
<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 f5f0494da0a..58a2dacc9ec 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;'>@@ -50,7 +50,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# qt56-qtbase replaces qt5-qtbase, so can not conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 12 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -644,7 +644,7 @@ build.env-append \
</span>
# Qt uses CFRunLoopTimerCreateWithHandler, which was not introduced until Mac OS X 10.7
# see https://developer.apple.com/reference/corefoundation/1542555-cfrunlooptimercreatewithhandler?language=objc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.7 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -739,7 +739,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://developer.apple.com/reference/security/sslprotocol/ktlsprotocol11
# see https://developer.apple.com/reference/security/sslprotocol?language=objc
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 && ![variant_isset openssl] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 12 && ![variant_isset openssl] } {
</span> ui_error "using Secure Transport requires OS X 10.8 or later"
ui_error "please use openssl variant"
return -code error "incompatible variant choice"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -784,7 +784,7 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-machtest.diff
# prior to 10.8, CFNetwork was part of CoreServices
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 12 } {
</span> patchfiles-append patch-qnetworkproxy_mac.cpp.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -882,7 +882,7 @@ foreach {module module_info} [array get modules] {
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.platform} eq "darwin" && ${os.major} < 13} {
</span> set cxx_abi " -D_GLIBCXX_USE_CXX11_ABI=0"
} else {
set cxx_abi ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1289,7 +1289,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} 6] "~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:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 13 || (${module_doc} ne "qtwebengine" && ${module_doc} ne "qtwebview") } {
</span> depends_lib-append port:${name}-${module_doc}-docs
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1380,7 +1380,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://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:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 13 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.9 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1428,7 +1428,7 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtmultimedia" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 13 } {
</span> # see https://trac.macports.org/ticket/52922
patchfiles-append patch-firstObject.diff
}
<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 fb154dab8fa..c06118c0bc0 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;'>@@ -50,7 +50,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# qt57-qtbase replaces qt5-qtbase, so can not conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} == 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} == 12 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -736,7 +736,7 @@ build.env-append \
</span>
# the Qt 5.7 class QUuid requires NSUUID, which was introduced in OS X 10.8
# see https://developer.apple.com/reference/foundation/nsuuid?language=objc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 12 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 12 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.8 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -952,7 +952,7 @@ foreach {module module_info} [array get modules] {
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.cxx_stdlib} eq "macports-libstdc++" && ${os.platform} eq "darwin" && ${os.major} < 13} {
</span> set cxx_abi " -D_GLIBCXX_USE_CXX11_ABI=0"
} else {
set cxx_abi ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1362,7 +1362,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} 6] "~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:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 13 || (${module_doc} ne "qtwebengine" && ${module_doc} ne "qtwebview") } {
</span> depends_lib-append port:${name}-${module_doc}-docs
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1453,15 +1453,17 @@ foreach {module module_info} [array get modules] {
</span> # see https://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;'>- 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;'>+ 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;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> }
# see http://lists.qt-project.org/pipermail/interest/2016-February/thread.html#20946
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1506,7 +1508,7 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtmultimedia" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} < 13 } {
</span> # see https://trac.macports.org/ticket/52922
# see https://trac.macports.org/ticket/53949
patchfiles-append patch-firstObject.diff
<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 f704c6451fb..41e0fa03245 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;'>@@ -50,7 +50,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# qt58-qtbase replaces qt5-qtbase, so can not conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} == 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} == 13 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -758,7 +758,7 @@ build.env-append \
</span>
# the Qt 5.8 requires NSWindowDidChangeOcclusionStateNotification, which was introduced in 10.9
# see https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/AppKit.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 13 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 13 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.9 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1430,7 +1430,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://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:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} == 13 } {
</span> # see https://bugreports.qt.io/browse/QTBUG-54486
configure.sdk_version 10.10
}
<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 66e74651274..debc03914c3 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;'>@@ -21,7 +21,7 @@ if { ${subport} eq "${name}-qtwebkit" ||
</span> }
# https://trac.macports.org/ticket/63154
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${xcodeversion} ne "none" || ${os.major} >= 21 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${xcodeversion} ne "none" || ${os.platform} eq "darwin" && ${os.major} >= 21 } {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ foreach {qt_test_name qt_test_info} [array get available_qt_versions] {
</span> }
# qt59-qtbase replaces qt5-qtbase, so can not conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} == 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} == 14 } {
</span> conflicts-delete qt5-qtbase
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -777,7 +777,7 @@ build.env-append \
</span>
# Qt 5.9 requires LSCopyDefaultApplicationURLForURL, which was introduced in macOS 10.10
# see https://developer.apple.com/library/content/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/frameworks/CoreServices.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 14 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 14 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires OS X 10.10 or later"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -887,7 +887,7 @@ foreach {module module_info} [array get modules] {
</span> # see https://trac.macports.org/ticket/59312
# avoid
# Failed to resolve SDK path for 'macosx'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 14} {
</span> use_xcode yes
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt6/Portfile b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f733351bbf6..4adddb3a6a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -475,7 +475,7 @@ build.env-append \
</span> PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 18 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 18 } {
</span> known_fail yes
pre-fetch {
ui_error "${subport} requires macOS 10.14 or later"
</pre><pre style='margin:0'>
</pre>