<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/3026c04d1dc4b5f363546f95d93cfa3a66e2b019">https://github.com/macports/macports-ports/commit/3026c04d1dc4b5f363546f95d93cfa3a66e2b019</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 3026c04d1dc qt5-*: fix build with ICU 76
</span>3026c04d1dc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3026c04d1dc4b5f363546f95d93cfa3a66e2b019
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue Dec 17 17:16:54 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> qt5-*: fix build with ICU 76
</span>---
aqua/qt5/Portfile | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 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 2e2de1d1ebe..5c444ea9037 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;'>@@ -220,7 +220,7 @@ array set modules {
</span> {"Qt Core" "Qt GUI" "Qt Network" "Qt SQL" "Qt Test" "Qt Widgets" "Qt Concurrent" "Qt D-Bus" "Qt OpenGL" "Qt Platform Headers" "Qt Print Support" "Qt XML"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -355,7 +355,7 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 1"
</span> "License: "
}
qtlottie {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -711,7 +711,7 @@ array set modules {
</span> {"Qt WebKit" "Qt WebKit Widgets"}
"community support only (use Qt WebEngine)"
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 7"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 8"
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1395,6 +1395,10 @@ foreach {module module_info} [array get modules] {
</span> configure.universal_cxxflags
configure.universal_cppflags
<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><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;background:#e0e0e0;'>@@ -1588,6 +1592,10 @@ foreach {module module_info} [array get modules] {
</span>
# avoid unnecessary dependency on OpenSSL
configure.args-append "QMAKE_LIBS_OPENSSL="
<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_CXX14=-std=c++17
</span> }
# special case
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1658,7 +1666,13 @@ foreach {module module_info} [array get modules] {
</span> foreach test { glx libXcomposite libXrender } {
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;'>+ reinplace "s|icu-i18n|icu-i18n icu-uc|g" ${worksrcpath}/Source/WTF/WTF.pri
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|auto_ptr|unique_ptr|g" ${worksrcpath}/Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h
</span> }
<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>