<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6d02bcf2712981a9ba0f4d6a79348ecebc9486c7">https://github.com/macports/macports-ports/commit/6d02bcf2712981a9ba0f4d6a79348ecebc9486c7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6d02bcf2712981a9ba0f4d6a79348ecebc9486c7
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Fri Jul 22 17:36:45 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qt513-qtdeclarative: copy build fix over from qt5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Put changes intended to be applied simultaneously in a single patchfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/62806
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [skip ci]
</span>---
aqua/qt5/Portfile | 7 ++++---
...icode-Unicode.h.diff => patch-qtdeclarative-masm.diff} | 15 +++++++++++++++
.../patch-src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff | 15 ---------------
aqua/qt513/Portfile | 4 ++++
.../files/patch-qtdeclarative-masm.diff} | 15 +++++++++++++++
5 files changed, 38 insertions(+), 18 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 cea0f17c68b..172fb3bbe73 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;'>@@ -1557,9 +1557,10 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtdeclarative" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/62806
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error: typedef redefinition with different types ('char16_t' vs 'unsigned short')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtdeclarative-masm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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-qtdeclarative-masm.diff
</span>similarity index 55%
copy from aqua/qt5/files/patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff
copy to aqua/qt5/files/patch-qtdeclarative-masm.diff
<span style='display:block; white-space:pre;color:#808080;'>index e109d6d8d90..2a2f69622b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt5/files/patch-qtdeclarative-masm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,3 +32,18 @@
</span>
#define U16_IS_LEAD(ch) QChar::isHighSurrogate((ch))
#define U16_IS_TRAIL(ch) QChar::isLowSurrogate((ch))
<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><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 102678680b9..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-src-3rdparty-masm-yarr-YarrInterpreter.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/3rdparty/masm/yarr/YarrInterpreter.cpp.b 2020-10-27 01:02:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/3rdparty/masm/yarr/YarrInterpreter.cpp 2021-05-21 16:24:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1719,8 +1719,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void atomPatternCharacter(UChar32 ch, unsigned inputPosition, unsigned frameLocation, Checked<unsigned> quantityMaxCount, QuantifierType quantityType)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_pattern.ignoreCase()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UChar32 lo = u_tolower(ch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- UChar32 hi = u_toupper(ch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // this is a terribly fughly way to go about working around
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // problems with icu's macros that alter the u_tolower() name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UChar32 lo = qt5_u_tolower(ch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ UChar32 hi = qt5_u_toupper(ch);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (lo != hi) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_bodyDisjunction->terms.append(ByteTerm(lo, hi, inputPosition, frameLocation, quantityMaxCount, quantityType));
</span><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 fdb8e2d38b8..4bae5cee266 100755
</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;'>@@ -1379,6 +1379,10 @@ foreach {module module_info} [array get modules] {
</span>
# special case
if { ${module} eq "qtdeclarative" } {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/62806
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # error: typedef redefinition with different types ('char16_t' vs 'unsigned short')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qtdeclarative-masm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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/qt513/files/patch-qtdeclarative-masm.diff
</span>similarity index 55%
rename from aqua/qt5/files/patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff
rename to aqua/qt513/files/patch-qtdeclarative-masm.diff
<span style='display:block; white-space:pre;color:#808080;'>index e109d6d8d90..2a2f69622b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt5/files/patch-src-3rdparty-masm-stubs-wtf-unicode-Unicode.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt513/files/patch-qtdeclarative-masm.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,3 +32,18 @@
</span>
#define U16_IS_LEAD(ch) QChar::isHighSurrogate((ch))
#define U16_IS_TRAIL(ch) QChar::isLowSurrogate((ch))
<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>