<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c18ce229b741c87690b6e286a52069d1716cde23">https://github.com/macports/macports-ports/commit/c18ce229b741c87690b6e286a52069d1716cde23</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c18ce229b741c87690b6e286a52069d1716cde23
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jan 3 22:05:39 2022 +1100
<span style='display:block; white-space:pre;color:#404040;'> qt*: set known_fail where needed
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62190
</span>---
aqua/qt55/Portfile | 13 +++++++++++++
aqua/qt56/Portfile | 13 +++++++++++++
aqua/qt57/Portfile | 13 +++++++++++++
aqua/qt58/Portfile | 14 ++++++++++++++
aqua/qt59/Portfile | 7 +++++++
aqua/qt6/Portfile | 14 +++++++++++++-
6 files changed, 73 insertions(+), 1 deletion(-)
<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 e080076be23..9fe9137e734 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;'>@@ -1433,6 +1433,19 @@ foreach {module module_info} [array get modules] {
</span> move ${worksrcpath}/src/3rdparty/javascriptcore/VERSION ${worksrcpath}/src/3rdparty/javascriptcore/VERSION.txt
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Project ERROR: Xcode not set up properly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</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} does not build on macOS 10.15 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;'>+ }
</span> }
}
<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 f1b664a5520..76971a15ec0 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;'>@@ -1469,6 +1469,19 @@ foreach {module module_info} [array get modules] {
</span> # dependents of qtwebengine
supported_archs x86_64
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Project ERROR: Xcode not set up properly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</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} does not build on macOS 10.15 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;'>+ }
</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 107db9ba619..298b03f8d80 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;'>@@ -1551,6 +1551,19 @@ foreach {module module_info} [array get modules] {
</span> # dependents of qtwebengine
supported_archs x86_64
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Project ERROR: Could not resolve SDK Path for 'macosx'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</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} does not build on macOS 10.15 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;'>+ }
</span> }
}
<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 847cb94ab53..4da6f992521 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;'>@@ -1565,6 +1565,20 @@ foreach {module module_info} [array get modules] {
</span> # dependents of qtwebengine
supported_archs x86_64
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # special case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${module} eq "qtsvg" && ${os.platform} eq "darwin" && ${os.major} >= 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Project ERROR: Could not resolve SDK Path for 'macosx'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/62190
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</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} does not build on macOS 10.15 or later, see https://trac.macports.org/ticket/62190"
</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;'>+ }
</span> }
}
<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 5d109bd17f7..974468f1d12 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;'>@@ -780,6 +780,13 @@ if { ${os.major} < 14 } {
</span> ui_error "${subport} requires OS X 10.10 or later"
return -code error "incompatible OS version"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Failed to resolve SDK path for 'macosx12'
</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} does not build on macOS 12 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> }
foreach {module module_info} [array get modules] {
<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 60b16ea4662..f1304e023a8 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;'>@@ -496,7 +496,7 @@ if { ${os.major} < 18 } {
</span> # https://trac.macports.org/ticket/64345
known_fail yes
pre-fetch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} is currently broken on macOS 10.14"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} is currently broken on macOS 10.14, see https://trac.macports.org/ticket/64345"
</span> return -code error "incompatible OS version"
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -989,6 +989,18 @@ foreach {module module_info} [array get modules] {
</span> ###############################################################################
# Special Cases
###############################################################################
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${module} eq "qtimageformats"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/64346
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_extract
</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} is currently broken, see https://trac.macports.org/ticket/64346"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "broken port"
</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>