<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/26cd5af4b070191e790af585d7a681fa436e0072">https://github.com/macports/macports-ports/commit/26cd5af4b070191e790af585d7a681fa436e0072</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 26cd5af4b07 qt513-*: fix build with ICU 76
</span>26cd5af4b07 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 26cd5af4b070191e790af585d7a681fa436e0072
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue Dec 17 18:26:12 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> qt513-*: fix build with ICU 76
</span>---
aqua/qt513/Portfile | 17 +++++++++---
aqua/qt513/files/patch-icu.diff | 2 +-
aqua/qt513/files/patch-qtwebkit-cxx17.diff | 43 ++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 4 deletions(-)
<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 acb02a20779..efc89045ad6 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;'>@@ -162,7 +162,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 10"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 11"
</span> "License: "
}
qtcharts {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,7 +297,7 @@ array set modules {
</span> {"Qt Location" "Qt Positioning"}
""
"variant overrides: "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "revision 5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 6"
</span> "License: "
}
qtlottie {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -627,7 +627,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 5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "revision 6"
</span> "License: "
}
qtwebkit-examples {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1153,6 +1153,10 @@ foreach {module module_info} [array get modules] {
</span> -no-libudev \
-no-egl
<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> # 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;'>@@ -1369,6 +1373,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;'>@@ -1400,6 +1408,9 @@ foreach {module module_info} [array get modules] {
</span> patchfiles-append patch-webkit_XPathGrammar.y.diff
patchfiles-append patch-webkit_makegrammar.pl.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix compiling with C++17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtwebkit-cxx17.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # qtwebkit uses
# glx
# libXcomposite
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-icu.diff b/aqua/qt513/files/patch-icu.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5aeb3ab1ba4..5becf28d896 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt513/files/patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-icu.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@
</span> - INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
- LIBS += -licucore
+ CONFIG += link_pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKGCONFIG *= icu-i18n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKGCONFIG *= icu-i18n icu-uc
</span> } else:!use?(wchar_unicode): {
win32 {
CONFIG(static, static|shared) {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt513/files/patch-qtwebkit-cxx17.diff b/aqua/qt513/files/patch-qtwebkit-cxx17.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b2bc837b603
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtwebkit-cxx17.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WTF/wtf/MathExtras.h.orig 2016-04-10 10:48:36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WTF/wtf/MathExtras.h 2024-12-16 18:39:15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,15 +73,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double sqrtOfTwoDouble = M_SQRT2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-// Work around a bug in the Mac OS X libc where ceil(-0.1) return +0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-inline double wtf_ceil(double x) { return copysign(ceil(x), x); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define ceil(x) wtf_ceil(x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if OS(SOLARIS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace std {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/LayoutUnit.h.orig 2016-04-10 10:48:37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/LayoutUnit.h 2024-12-16 18:49:49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,11 +210,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ returnValue.setRawValue(::abs(m_value));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return returnValue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if OS(DARWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int wtf_ceil() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ceil() const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE(SUBPIXEL_LAYOUT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h.orig 2016-04-10 10:48:36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/ThirdParty/ANGLE/src/compiler/preprocessor/MacroExpander.h 2024-12-16 18:40:49
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MacroSet* mMacroSet;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Diagnostics* mDiagnostics;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::auto_ptr<Token> mReserveToken;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::unique_ptr<Token> mReserveToken;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<MacroContext*> mContextStack;
</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>