<pre style='margin:0'>
ghosthound pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ae742de3590a4e4a262ecef59a2a41aa4de787f6">https://github.com/macports/macports-ports/commit/ae742de3590a4e4a262ecef59a2a41aa4de787f6</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 ae742de3590 aqua/qt5:  add a couple of fughly patches to qt5-qtdeclarative to sidestep compile issues with icu. resolves https://trac.macports.org/ticket/62806
</span>ae742de3590 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ae742de3590a4e4a262ecef59a2a41aa4de787f6
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Sat May 22 11:11:13 2021 -0700

<span style='display:block; white-space:pre;color:#404040;'>    aqua/qt5:  add a couple of fughly patches to qt5-qtdeclarative to sidestep compile issues with icu.
</span><span style='display:block; white-space:pre;color:#404040;'>    resolves https://trac.macports.org/ticket/62806
</span>---
 aqua/qt5/Portfile                                  |  3 ++
 ...-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff | 34 ++++++++++++++++++++++
 ...src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff | 15 ++++++++++
 3 files changed, 52 insertions(+)

<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 2df916bfab3..b22204d9bad 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;'>@@ -1480,6 +1480,9 @@ foreach {module module_info} [array get modules] {
</span> 
             # special case
             if { ${module} eq "qtdeclarative" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                patchfiles-append  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff
</span>                 # attempts to link against installed version, which causes an error when upgrading 5.9.3->5.10.0
                 qt5.frameworkpaths-append ${worksrcpath}/lib
             }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff b/aqua/qt5/files/patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e109d6d8d90
</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-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/masm/stubs/wtf/unicode/Unicode.h.b        2020-10-27 01:02:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/masm/stubs/wtf/unicode/Unicode.h  2021-05-21 16:24:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QChar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef unsigned char LChar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-typedef unsigned short UChar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef char16_t UChar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef int32_t UChar32;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace Unicode {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,16 +53,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     inline UChar toUpper(UChar ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return QChar::toUpper(ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    inline UChar32 u_tolower(UChar32 ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    // this is a terribly fughly way to go about working around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    //  problems with icu's macros that alter the u_tolower() name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    inline UChar32 qt5_u_tolower(UChar32 ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return QChar::toLower(ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    inline UChar32 u_toupper(UChar32 ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    inline UChar32 qt5_u_toupper(UChar32 ch) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return QChar::toUpper(ch);
</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;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using Unicode::u_toupper;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-using Unicode::u_tolower;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using Unicode::qt5_u_toupper;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++using Unicode::qt5_u_tolower;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define U16_IS_LEAD(ch) QChar::isHighSurrogate((ch))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define U16_IS_TRAIL(ch) QChar::isLowSurrogate((ch))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt5/files/patch-src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff b/aqua/qt5/files/patch-src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..102678680b9
</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-src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/3rdparty/masm/yarr/YarrInterpreter.cpp.b   2020-10-27 01:02:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/3rdparty/masm/yarr/YarrInterpreter.cpp     2021-05-21 16:24:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1719,8 +1719,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     void atomPatternCharacter(UChar32 ch, unsigned inputPosition, unsigned frameLocation, Checked<unsigned> quantityMaxCount, QuantifierType quantityType)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         if (m_pattern.ignoreCase()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            UChar32 lo = u_tolower(ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            UChar32 hi = u_toupper(ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            // this is a terribly fughly way to go about working around
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            //  problems with icu's macros that alter the u_tolower() name.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            UChar32 lo = qt5_u_tolower(ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            UChar32 hi = qt5_u_toupper(ch);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             if (lo != hi) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                 m_bodyDisjunction->terms.append(ByteTerm(lo, hi, inputPosition, frameLocation, quantityMaxCount, quantityType));
</span></pre><pre style='margin:0'>

</pre>