Bug#1010118: qtwebkit-opensource-src FTBFS with ICU 71.1
Control: tags -1 +patch
On Sun, Apr 24, 2022 at 10:18 PM Adrian Bunk <bunk@debian.org> wrote:
> Source: qtwebkit-opensource-src
> Version: 5.212.0~alpha4-14
> Severity: serious
> Tags: ftbfs
>
> In file included from /<<PKGBUILDDIR>>/Source/WebCore/platform/text/TextAllInOne.cpp:31:
> /<<PKGBUILDDIR>>/Source/WebCore/platform/text/TextCodecICU.cpp: In member function ‘void WebCore::TextCodecICU::createICUConverter() const’:
> /<<PKGBUILDDIR>>/Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: ‘TRUE’ was not declared in this scope
> 311 | ucnv_setFallback(m_converterICU, TRUE);
> | ^~~~
> ...
My bad, submitting the required patch only now.
Regards,
Laszalo/GCS
Description: replace old ICU TRUE / FALSE constants
For some time ICU (since 68.1+ for sure) no longer specify nonstandard
TRUE / FALSE constants. Use UBool(1) and UBool(0) instead.
Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Bug-Debian: https://bugs.debian.org/1010118
Forwarded: no
Last-Update: 2022-04-24
---
--- qtwebkit-opensource-src-5.212.0~alpha4.orig/Source/WebCore/platform/text/TextCodecICU.cpp
+++ qtwebkit-opensource-src-5.212.0~alpha4/Source/WebCore/platform/text/TextCodecICU.cpp
@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter()
m_converterICU = ucnv_open(m_canonicalConverterName, &err);
ASSERT(U_SUCCESS(err));
if (m_converterICU)
- ucnv_setFallback(m_converterICU, TRUE);
+ ucnv_setFallback(m_converterICU, UBool(1));
}
int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
--- qtwebkit-opensource-src-5.212.0~alpha4.orig/Source/WebCore/platform/text/icu/UTextProvider.h
+++ qtwebkit-opensource-src-5.212.0~alpha4/Source/WebCore/platform/text/icu/UTextProvider.h
@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRan
// 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 = UBool(1);
return true;
}
if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
text->chunkOffset = text->chunkLength;
- isAccessible = FALSE;
+ isAccessible = UBool(0);
return true;
}
} else {
@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRan
// 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 = UBool(1);
return true;
}
if (nativeIndex <= 0 && !text->chunkNativeStart) {
text->chunkOffset = 0;
- isAccessible = FALSE;
+ isAccessible = UBool(0);
return true;
}
}
--- qtwebkit-opensource-src-5.212.0~alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+++ qtwebkit-opensource-src-5.212.0~alpha4/Source/WebCore/platform/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<int32_t>(index - uText->chunkNativeStart);
- return TRUE;
+ return UBool(1);
}
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 UBool(0);
}
} 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 UBool(1);
}
if (!index && !uText->chunkNativeStart) {
// Already at the beginning; can't go any farther.
uText->chunkOffset = 0;
- return FALSE;
+ return UBool(0);
}
}
@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uT
uText->nativeIndexingLimit = uText->chunkLength;
- return TRUE;
+ return UBool(1);
}
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 uTextLatin1ContextAwareNa
static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
{
if (!text->context)
- return FALSE;
+ return UBool(0);
int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
UBool isAccessible;
if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAcce
ASSERT(newContext == UTextProviderContext::PriorContext);
textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
}
- return TRUE;
+ return UBool(1);
}
static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
--- qtwebkit-opensource-src-5.212.0~alpha4.orig/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+++ qtwebkit-opensource-src-5.212.0~alpha4/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextA
static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
{
if (!text->context)
- return FALSE;
+ return UBool(0);
int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
UBool isAccessible;
if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAcces
ASSERT(newContext == UTextProviderContext::PriorContext);
textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
}
- return TRUE;
+ return UBool(1);
}
static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
Reply to: