qt5-webkit/trunk/icu68.patch

   1 Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
   2
   3 In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
   4 Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
   5         ucnv_setFallback(m_converterICU, TRUE);
   6                                          ^
   7 In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
   8 In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
   9 Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
  10             isAccessible = TRUE;
  11                            ^
  12 Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
  13             isAccessible = FALSE;
  14                            ^
  15 Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
  16             isAccessible = TRUE;
  17                            ^
  18 Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
  19             isAccessible = FALSE;
  20                            ^
  21 In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
  22 Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
  23             return TRUE;
  24                    ^
  25 Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
  26             return FALSE;
  27                    ^
  28 Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
  29             return TRUE;
  30                    ^
  31 Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
  32             return FALSE;
  33                    ^
  34 Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
  35     return TRUE;
  36            ^
  37 Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
  38         return FALSE;
  39                ^
  40 Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
  41     return TRUE;
  42            ^
  43 In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
  44 Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
  45         return FALSE;
  46                ^
  47 Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
  48     return TRUE;
  49            ^
  50
  51 --- Source/WebCore/platform/text/TextCodecICU.cpp.orig  2020-03-04 17:16:37 UTC
  52 +++ Source/WebCore/platform/text/TextCodecICU.cpp
  53 @@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
  54      m_converterICU = ucnv_open(m_canonicalConverterName, &err);
  55      ASSERT(U_SUCCESS(err));
  56      if (m_converterICU)
  57 -        ucnv_setFallback(m_converterICU, TRUE);
  58 +        ucnv_setFallback(m_converterICU, true);
  59  }
  60
  61  int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
  62 --- Source/WebCore/platform/text/icu/UTextProvider.h.orig       2020-03-04 17:16:37 UTC
  63 +++ Source/WebCore/platform/text/icu/UTextProvider.h
  64 @@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
  65              // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
  66              ASSERT(offset < std::numeric_limits<int32_t>::max());
  67              text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
  68 -            isAccessible = TRUE;
  69 +            isAccessible = true;
  70              return true;
  71          }
  72          if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
  73              text->chunkOffset = text->chunkLength;
  74 -            isAccessible = FALSE;
  75 +            isAccessible = false;
  76              return true;
  77          }
  78      } else {
  79 @@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
  80              // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
  81              ASSERT(offset < std::numeric_limits<int32_t>::max());
  82              text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
  83 -            isAccessible = TRUE;
  84 +            isAccessible = true;
  85              return true;
  86          }
  87          if (nativeIndex <= 0 && !text->chunkNativeStart) {
  88              text->chunkOffset = 0;
  89 -            isAccessible = FALSE;
  90 +            isAccessible = false;
  91              return true;
  92          }
  93      }
  94 --- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig       2020-03-04 17:16:37 UTC
  95 +++ Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
  96 @@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
  97          if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
  98              // Already inside the buffer. Set the new offset.
  99              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
 100 -            return TRUE;
 101 +            return true;
 102          }
 103          if (index >= length && uText->chunkNativeLimit == length) {
 104              // Off the end of the buffer, but we can't get it.
 105              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
 106 -            return FALSE;
 107 +            return false;
 108          }
 109      } else {
 110          if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
 111              // Already inside the buffer. Set the new offset.
 112              uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
 113 -            return TRUE;
 114 +            return true;
 115          }
 116          if (!index && !uText->chunkNativeStart) {
 117              // Already at the beginning; can't go any farther.
 118              uText->chunkOffset = 0;
 119 -            return FALSE;
 120 +            return false;
 121          }
 122      }
 123
 124 @@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
 125
 126      uText->nativeIndexingLimit = uText->chunkLength;
 127
 128 -    return TRUE;
 129 +    return true;
 130  }
 131
 132  static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
 133 @@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
 134  static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
 135  {
 136      if (!text->context)
 137 -        return FALSE;
 138 +        return false;
 139      int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
 140      UBool isAccessible;
 141      if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
 142 @@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
 143          ASSERT(newContext == UTextProviderContext::PriorContext);
 144          textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
 145      }
 146 -    return TRUE;
 147 +    return true;
 148  }
 149
 150  static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
 151 --- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig        2020-03-04 17:16:37 UTC
 152 +++ Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
 153 @@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
 154  static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
 155  {
 156      if (!text->context)
 157 -        return FALSE;
 158 +        return false;
 159      int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
 160      UBool isAccessible;
 161      if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
 162 @@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
 163          ASSERT(newContext == UTextProviderContext::PriorContext);
 164          textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
 165      }
 166 -    return TRUE;
 167 +    return true;
 168  }
 169
 170  static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)