<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/c3d4390be49f19f53acb7376b4b447973e33dfad">https://github.com/macports/macports-ports/commit/c3d4390be49f19f53acb7376b4b447973e33dfad</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 c3d4390be49 qt5-qtwebkit: add proper patch
</span>c3d4390be49 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c3d4390be49f19f53acb7376b4b447973e33dfad
</span>Author: Mohamed Akram <makr@macports.org>
AuthorDate: Tue Dec 17 18:01:28 2024 +0400
<span style='display:block; white-space:pre;color:#404040;'> qt5-qtwebkit: add proper patch
</span>---
aqua/qt5/Portfile | 7 +++---
aqua/qt5/files/patch-qtwebkit-cxx17.diff | 43 ++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 4 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 325aff2890e..c141bf92b9a 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;'>@@ -1647,6 +1647,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> # work around changed vm_param.h in MacOSX.sdk 11+ -- the older code in 2014-vintage qtwebkit expects
# PAGE_SHIFT to be set to I386_PAGE_SHIFT when on x86_64
# the 11.0 + SDK defines that only if MAC_OS_X_VERSION_MIN_REQUIRED is < 101600 (to support arm64 after that)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1667,10 +1670,6 @@ 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
}
reinplace "s|icu-i18n|icu-i18n icu-uc|g" ${worksrcpath}/Source/WTF/WTF.pri
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 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:#ffe0e0;'>- reinplace -E "s|wtf_ceil\(x?\)|ceil|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Source/WTF/wtf/MathExtras.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Source/WebCore/platform/LayoutUnit.h
</span> }
# ICU requires C++17
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-qtwebkit-cxx17.diff b/aqua/qt5/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/qt5/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>