head 1.2; access; symbols; locks; strict; comment @// @; 1.2 date 2020.12.15.17.59.00; author leot; state dead; branches; next 1.1; commitid YmiJj0xvkcfhKRzC; 1.1 date 2020.11.06.22.21.35; author leot; state Exp; branches; next ; commitid l59r5QPGe1nQrSuC; desc @@ 1.2 log @webkit-gtk: Update to 2.30.4 pkgsrc changes: - Remove ICU 68.1 patches applied upstream Changes: WebKitGTK 2.30.4 ================ - Fix text data sent with WebSockets when using libsoup < 2.68. - Fix the rendering on Raspberry Pi 3 using the proprietary video driver. - Fix clipping of descedant layers of a mask layer. - Fix the build with ICU 68.1. @ text @$NetBSD: patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp,v 1.1 2020/11/06 22:21:35 leot Exp $ Backport upstream changeset 269325. [WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and TRUE macros by default ​https://bugs.webkit.org/show_bug.cgi?id=218522 --- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-08-12 09:17:54.000000000 +0000 +++ Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp @@@@ -100,23 +100,23 @@@@ static UBool uTextLatin1Access(UText* uT if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { // Already inside the buffer. Set the new offset. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return TRUE; + return true; } if (index >= length && uText->chunkNativeLimit == length) { // Off the end of the buffer, but we can't get it. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return FALSE; + return false; } } else { if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) { // Already inside the buffer. Set the new offset. uText->chunkOffset = static_cast(index - uText->chunkNativeStart); - return TRUE; + return true; } if (!index && !uText->chunkNativeStart) { // Already at the beginning; can't go any farther. uText->chunkOffset = 0; - return FALSE; + return false; } } @@@@ -144,7 +144,7 @@@@ static UBool uTextLatin1Access(UText* uT uText->nativeIndexingLimit = uText->chunkLength; - return TRUE; + return true; } static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status) @@@@ -337,7 +337,7 @@@@ static int64_t uTextLatin1ContextAwareNa static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) { if (!text->context) - return FALSE; + return false; int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text); UBool isAccessible; if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) @@@@ -357,7 +357,7 @@@@ static UBool uTextLatin1ContextAwareAcce ASSERT(newContext == UTextProviderContext::PriorContext); textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); } - return TRUE; + return true; } static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) @ 1.1 log @webkit-gtk: Backport patches needed for building with ICU 68.1 From upstream changeset 269325. @ text @d1 1 a1 1 $NetBSD$ @