<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/202d6e816201532ae48fe2bdc54a8b93ffc2430f">https://github.com/macports/macports-ports/commit/202d6e816201532ae48fe2bdc54a8b93ffc2430f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 202d6e816201532ae48fe2bdc54a8b93ffc2430f
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Sep 6 16:01:20 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> webkit-gtk: fix build with ICU 68
</span>---
www/webkit-gtk/Portfile | 3 +-
www/webkit-gtk/files/patch-icu-68-true-false.diff | 128 ++++++++++++++++++++++
2 files changed, 130 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk/Portfile b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd658886b6b..79c15180b00 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,8 @@ patchfiles clang-assertions.patch \
</span> bison-3.7.patch \
glibc-2.68.patch \
patch-fix_page_shift.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-support-arm64.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-support-arm64.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-icu-68-true-false.diff
</span>
conflicts_build google-test
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk/files/patch-icu-68-true-false.diff b/www/webkit-gtk/files/patch-icu-68-true-false.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e4a0369b852
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk/files/patch-icu-68-true-false.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,128 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/platform/text/icu/UTextProvider.h Source/WebCore/platform/text/icu/UTextProvider.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c8f28d6ed3da..3c6fbeab6a5c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/text/icu/UTextProvider.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/text/icu/UTextProvider.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(offset < std::numeric_limits<int32_t>::max());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isAccessible = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isAccessible = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ text->chunkOffset = text->chunkLength;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isAccessible = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isAccessible = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(offset < std::numeric_limits<int32_t>::max());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isAccessible = TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isAccessible = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ text->chunkOffset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isAccessible = FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ isAccessible = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</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;'>+diff --git Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0a646b7f390d..49980f95ba79 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Already inside the buffer. Set the new offset.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (index >= length && uText->chunkNativeLimit == length) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Off the end of the buffer, but we can't get it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Already inside the buffer. Set the new offset.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!index && !uText->chunkNativeStart) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Already at the beginning; can't go any farther.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uText->chunkOffset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</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;'>+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uText->nativeIndexingLimit = uText->chunkLength;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return true;
</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;'>+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -337,7 +337,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UText* text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!text->context)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UBool isAccessible;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -357,7 +357,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(newContext == UTextProviderContext::PriorContext);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return true;
</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;'>+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 69c8d091bd62..9c3fa709200a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!text->context)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ UBool isAccessible;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(newContext == UTextProviderContext::PriorContext);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return true;
</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;'>+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Source/WebCore/platform/text/TextCodecICU.cpp Source/WebCore/platform/text/TextCodecICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 19b41eb7125f..2f7d1930b8d7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/platform/text/TextCodecICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/platform/text/TextCodecICU.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -308,7 +308,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ASSERT(U_SUCCESS(err));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m_converterICU)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ucnv_setFallback(m_converterICU, TRUE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ucnv_setFallback(m_converterICU, true);
</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;'>+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
</span></pre><pre style='margin:0'>
</pre>