diff options
author | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
---|---|---|
committer | Jan Beich <jbeich@FreeBSD.org> | 2020-11-03 00:56:26 +0000 |
commit | 6d5d6429d5880f9fdf4b4b54c0fb53e44b3927f9 (patch) | |
tree | db7a5d68a7b148f62f63c9562391af1272e3f376 /www | |
parent | graphics/mesa-devel: update to 20.2.b.3686 (diff) |
devel/icu: update to 68.1
Changes: http://site.icu-project.org/download/68
ABI: https://abi-laboratory.pro/tracker/timeline/icu4c/
Reported by: GitHub (watch releases)
Diffstat (limited to 'www')
-rw-r--r-- | www/chromium/Makefile | 2 | ||||
-rw-r--r-- | www/cliqz/Makefile | 2 | ||||
-rw-r--r-- | www/epiphany/Makefile | 2 | ||||
-rw-r--r-- | www/firefox-esr/Makefile | 1 | ||||
-rw-r--r-- | www/firefox/Makefile | 1 | ||||
-rw-r--r-- | www/iridium/Makefile | 1 | ||||
-rw-r--r-- | www/node/Makefile | 1 | ||||
-rw-r--r-- | www/node10/Makefile | 1 | ||||
-rw-r--r-- | www/node10/files/patch-icu68 | 109 | ||||
-rw-r--r-- | www/node12/Makefile | 1 | ||||
-rw-r--r-- | www/node14/Makefile | 1 | ||||
-rw-r--r-- | www/qt5-webkit/Makefile | 2 | ||||
-rw-r--r-- | www/qt5-webkit/files/patch-icu68 | 170 | ||||
-rw-r--r-- | www/webkit2-gtk3/Makefile | 1 | ||||
-rw-r--r-- | www/webkit2-gtk3/files/patch-icu68 | 173 |
15 files changed, 464 insertions, 4 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile index f38570d89537..0b32ce197dc1 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -3,7 +3,7 @@ PORTNAME= chromium PORTVERSION= 85.0.4183.121 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www java MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \ LOCAL/rene/chromium/:fonts diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile index 08346bce8342..0c6df905d371 100644 --- a/www/cliqz/Makefile +++ b/www/cliqz/Makefile @@ -2,7 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.38.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index b2b4f23ac67e..4a627e1b677d 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,7 +3,7 @@ PORTNAME= epiphany PORTVERSION= 3.38.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 05f320b931d7..a49ba888db0f 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 78.4.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 0f84dc17cb7f..ea8f96490d82 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 82.0.2 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 3dc6af9ba039..1de2a2d34b49 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -3,6 +3,7 @@ PORTNAME= iridium PORTVERSION= 2020.04.81 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser diff --git a/www/node/Makefile b/www/node/Makefile index a02bac5e02fa..3f95411c9dad 100644 --- a/www/node/Makefile +++ b/www/node/Makefile @@ -3,6 +3,7 @@ PORTNAME= node DISTVERSIONPREFIX= v DISTVERSION= 15.0.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/ diff --git a/www/node10/Makefile b/www/node10/Makefile index 5c4850f55452..17992d5c28e0 100644 --- a/www/node10/Makefile +++ b/www/node10/Makefile @@ -3,6 +3,7 @@ PORTNAME= node PORTVERSION= 10.23.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 10 diff --git a/www/node10/files/patch-icu68 b/www/node10/files/patch-icu68 new file mode 100644 index 000000000000..69dbad34273e --- /dev/null +++ b/www/node10/files/patch-icu68 @@ -0,0 +1,109 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +../deps/v8/src/objects/intl-objects.cc:246:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/objects/intl-objects.cc:425:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/objects/intl-objects.cc:660:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/objects/intl-objects.cc:799:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/runtime/runtime-intl.cc:88:66: error: use of undeclared identifier 'TRUE' + uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error); + ^ +../deps/v8/src/runtime/runtime-intl.cc:135:66: error: use of undeclared identifier 'FALSE' + uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error); + ^ +../deps/v8/src/runtime/runtime-intl.cc:167:22: error: use of undeclared identifier 'FALSE' + FALSE, &status); + ^ +../deps/v8/src/runtime/runtime-intl.cc:402:9: error: use of undeclared identifier 'FALSE' + FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); + ^ +../deps/v8/src/runtime/runtime-intl.cc:404:9: error: use of undeclared identifier 'FALSE' + FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); + ^ + +--- deps/v8/src/objects/intl-objects.cc.orig 2020-09-15 13:25:38 UTC ++++ deps/v8/src/objects/intl-objects.cc +@@ -243,7 +243,7 @@ void SetResolvedDateSettings(Isolate* isolate, const i + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -422,7 +422,7 @@ void SetResolvedNumericSettings(Isolate* isolate, cons + char result[ULOC_FULLNAME_CAPACITY]; + UErrorCode status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -657,7 +657,7 @@ void SetResolvedCollatorSettings(Isolate* isolate, + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +@@ -796,7 +796,7 @@ void SetResolvedBreakIteratorSettings(Isolate* isolate + char result[ULOC_FULLNAME_CAPACITY]; + status = U_ZERO_ERROR; + uloc_toLanguageTag(icu_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + JSObject::SetProperty(resolved, factory->NewStringFromStaticChars("locale"), + factory->NewStringFromAsciiChecked(result), +--- deps/v8/src/runtime/runtime-intl.cc.orig 2020-09-15 13:25:38 UTC ++++ deps/v8/src/runtime/runtime-intl.cc +@@ -85,7 +85,7 @@ RUNTIME_FUNCTION(Runtime_CanonicalizeLanguageTag) { + char result[ULOC_FULLNAME_CAPACITY]; + + // Force strict BCP47 rules. +- uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, TRUE, &error); ++ uloc_toLanguageTag(icu_result, result, ULOC_FULLNAME_CAPACITY, true, &error); + + if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) { + return *factory->NewStringFromAsciiChecked(kInvalidTag); +@@ -132,7 +132,7 @@ RUNTIME_FUNCTION(Runtime_AvailableLocalesOf) { + + error = U_ZERO_ERROR; + // No need to force strict BCP47 rules. +- uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, FALSE, &error); ++ uloc_toLanguageTag(icu_name, result, ULOC_FULLNAME_CAPACITY, false, &error); + if (U_FAILURE(error) || error == U_STRING_NOT_TERMINATED_WARNING) { + // This shouldn't happen, but lets not break the user. + continue; +@@ -164,7 +164,7 @@ RUNTIME_FUNCTION(Runtime_GetDefaultICULocale) { + char result[ULOC_FULLNAME_CAPACITY]; + UErrorCode status = U_ZERO_ERROR; + uloc_toLanguageTag(default_locale.getName(), result, ULOC_FULLNAME_CAPACITY, +- FALSE, &status); ++ false, &status); + if (U_SUCCESS(status)) { + return *factory->NewStringFromAsciiChecked(result); + } +@@ -399,9 +399,9 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) { + std::unique_ptr<uc16[]> sap1; + std::unique_ptr<uc16[]> sap2; + icu::UnicodeString string_val1( +- FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); ++ false, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); + icu::UnicodeString string_val2( +- FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); ++ false, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); + result = collator->compare(string_val1, string_val2, status); + } + if (U_FAILURE(status)) return isolate->ThrowIllegalOperation(); diff --git a/www/node12/Makefile b/www/node12/Makefile index adfa30c8a643..2e9aeabd2b8c 100644 --- a/www/node12/Makefile +++ b/www/node12/Makefile @@ -3,6 +3,7 @@ PORTNAME= node PORTVERSION= 12.19.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 12 diff --git a/www/node14/Makefile b/www/node14/Makefile index 7c0a12fe24f8..d2d8f271669c 100644 --- a/www/node14/Makefile +++ b/www/node14/Makefile @@ -3,6 +3,7 @@ PORTNAME= node DISTVERSIONPREFIX= v DISTVERSION= 14.15.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${DISTVERSION}/ PKGNAMESUFFIX= 14 diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile index f2b073aa02e7..cf1fd9610310 100644 --- a/www/qt5-webkit/Makefile +++ b/www/qt5-webkit/Makefile @@ -2,7 +2,7 @@ PORTNAME= webkit DISTVERSION= 5.212.0-alpha4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/releases/download/${DISTNAME}/ PKGNAMEPREFIX= qt5- diff --git a/www/qt5-webkit/files/patch-icu68 b/www/qt5-webkit/files/patch-icu68 new file mode 100644 index 000000000000..25f094d7f35f --- /dev/null +++ b/www/qt5-webkit/files/patch-icu68 @@ -0,0 +1,170 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31: +Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE' + ucnv_setFallback(m_converterICU, TRUE); + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40: +In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27: +Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41: +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42: +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/TextCodecICU.cpp +@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const + m_converterICU = ucnv_open(m_canonicalConverterName, &err); + ASSERT(U_SUCCESS(err)); + if (m_converterICU) +- ucnv_setFallback(m_converterICU, TRUE); ++ ucnv_setFallback(m_converterICU, true); + } + + int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err) +--- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(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<int32_t>(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<int32_t>(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* uText, int64_t i + + 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) +@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe + 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)) +@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text + 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) +--- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC ++++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile index 04ad1399f84f..8d829799e97e 100644 --- a/www/webkit2-gtk3/Makefile +++ b/www/webkit2-gtk3/Makefile @@ -3,6 +3,7 @@ PORTNAME= webkit PORTVERSION= 2.30.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 diff --git a/www/webkit2-gtk3/files/patch-icu68 b/www/webkit2-gtk3/files/patch-icu68 new file mode 100644 index 000000000000..470bd88a217a --- /dev/null +++ b/www/webkit2-gtk3/files/patch-icu68 @@ -0,0 +1,173 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:30: +Source/WTF/wtf/text/icu/UTextProvider.h:82:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProvider.h:87:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProvider.h:96:28: error: use of undeclared identifier 'TRUE' + isAccessible = TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProvider.h:101:28: error: use of undeclared identifier 'FALSE' + isAccessible = FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:129:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp:149:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:340:16: error: use of undeclared identifier 'FALSE' + return FALSE; + ^ +Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp:360:12: error: use of undeclared identifier 'TRUE' + return TRUE; + ^ + +--- Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-08-12 09:17:54 UTC ++++ Source/WTF/wtf/text/icu/UTextProvider.h +@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) { + text->chunkOffset = text->chunkLength; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } else { +@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits<int32_t>::max()); + text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +--- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-08-12 09:17:54 UTC ++++ Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp +@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng + static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward) + { + if (!text->context) +- return FALSE; ++ return false; + int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text); + UBool isAccessible; + if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible)) +@@ -146,7 +146,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text, + ASSERT(newContext == UTextProviderContext::PriorContext); + textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward); + } +- return TRUE; ++ return true; + } + + static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode) +--- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-08-12 09:17:54 UTC ++++ Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i + if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) { + // Already inside the buffer. Set the new offset. + uText->chunkOffset = static_cast<int32_t>(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<int32_t>(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<int32_t>(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* uText, int64_t i + + 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 uTextLatin1ContextAwareNativeLength(UTe + 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 uTextLatin1ContextAwareAccess(UText* text + 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) |