<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2835e6af4e687227f306a8b09d75e673e61957d2">https://github.com/macports/macports-ports/commit/2835e6af4e687227f306a8b09d75e673e61957d2</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2835e6af4e6 qt5*: adjust c++17 requirement
</span>2835e6af4e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2835e6af4e687227f306a8b09d75e673e61957d2
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue Dec 17 18:45:02 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> qt5*: adjust c++17 requirement
</span>---
aqua/qt5/Portfile | 7 +++----
aqua/qt513/Portfile | 11 +++++++----
2 files changed, 10 insertions(+), 8 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 2b62151dfff..a102ad4443f 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;'>@@ -1312,6 +1312,9 @@ foreach {module module_info} [array get modules] {
</span>
# http://lists.qt-project.org/pipermail/development/2017-January/028392.html
# Prefer ICU over iconv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU requires C++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append QMAKE_CXXFLAGS_GNUCXX11=-std=c++17
</span>
# Additional options:
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1395,10 +1398,6 @@ foreach {module module_info} [array get modules] {
</span> configure.universal_cxxflags
configure.universal_cppflags
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ICU requires C++17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append QMAKE_CXXFLAGS_GNUCXX11=-std=c++17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # configure script looks for perl but doesn't seem to use it for our configuration
# configure script uses gawk if it can find it,
<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 efc89045ad6..92134a0f92d 100644
</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;'>@@ -1096,6 +1096,9 @@ foreach {module module_info} [array get modules] {
</span>
# http://lists.qt-project.org/pipermail/development/2017-January/028392.html
# Prefer ICU over iconv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU requires C++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append QMAKE_CXXFLAGS_GNUCXX11=-std=c++17
</span>
# Additional options:
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1153,10 +1156,6 @@ foreach {module module_info} [array get modules] {
</span> -no-libudev \
-no-egl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # ICU requires C++17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append QMAKE_CXXFLAGS_GNUCXX11=-std=c++17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Qt builds part of the system using environment provided by MacPorts.
# It builds the rest using its own internal environment.
# For consistency, clear MacPorts environment.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1422,6 +1421,10 @@ foreach {module module_info} [array get modules] {
</span> reinplace "s|return 0;|return 0;\\\n#error turn off test|g" ${worksrcpath}/Tools/qmake/config.tests/${test}/${test}.cpp
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ICU requires C++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append QMAKE_CXXFLAGS=-Wno-error=register
</span> }
# special case
</pre><pre style='margin:0'>
</pre>