diff --git a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200924.patchset b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200924.patchset index 748706621..6bff822e6 100644 --- a/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200924.patchset +++ b/dev-qt/qtwebkit/patches/qtwebkit-5.212.0~pre20200924.patchset @@ -1,4 +1,4 @@ -From 1c69b331947d4c1ea52189746e095aca04fbe040 Mon Sep 17 00:00:00 2001 +From 7cd638c1f30f1c8b72c8bfae8ef28200d6dee102 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 19 Jun 2020 21:33:30 +1000 Subject: Add Haiku support @@ -164,10 +164,10 @@ index 965e281..b2129b1 100644 || OS(NETBSD) \ || COMPILER(MINGW) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h -index 5717f3e..1185ee0 100644 +index 7aefa1b..7f97654 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h -@@ -400,6 +400,11 @@ +@@ -405,6 +405,11 @@ #define WTF_OS_NETBSD 1 #endif @@ -179,7 +179,7 @@ index 5717f3e..1185ee0 100644 /* OS(OPENBSD) - OpenBSD */ #ifdef __OpenBSD__ #define WTF_OS_OPENBSD 1 -@@ -425,6 +430,7 @@ +@@ -430,6 +435,7 @@ || OS(HURD) \ || OS(LINUX) \ || OS(NETBSD) \ @@ -1499,10 +1499,10 @@ index 694a759..aa701e8 100644 #endif RefPtr protector(this); diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake -index 39fb23b..855d5c3 100644 +index bce9ea2..bea3766 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake -@@ -760,6 +760,13 @@ if (ENABLE_X11_TARGET) +@@ -766,6 +766,13 @@ if (ENABLE_X11_TARGET) endif () endif () @@ -1517,5 +1517,162 @@ index 39fb23b..855d5c3 100644 set(USE_MEDIA_FOUNDATION OFF) set(USE_QT_MULTIMEDIA OFF) -- -2.26.0 +2.30.2 + + +From dfb6efface5aa195275b57754814c3e9e07f9edc Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 25 Feb 2022 15:48:30 +0100 +Subject: Patch for newer libs + + +diff --git a/Source/WebCore/platform/text/LocaleICU.cpp b/Source/WebCore/platform/text/LocaleICU.cpp +index 6fbe495..9ae0058 100644 +--- a/Source/WebCore/platform/text/LocaleICU.cpp ++++ b/Source/WebCore/platform/text/LocaleICU.cpp +@@ -153,12 +153,12 @@ static String getDateFormatPattern(const UDateFormat* dateFormat) + return emptyString(); + + UErrorCode status = U_ZERO_ERROR; +- int32_t length = udat_toPattern(dateFormat, TRUE, 0, 0, &status); ++ int32_t length = udat_toPattern(dateFormat, true, 0, 0, &status); + if (status != U_BUFFER_OVERFLOW_ERROR || !length) + return emptyString(); + Vector buffer(length); + status = U_ZERO_ERROR; +- udat_toPattern(dateFormat, TRUE, buffer.data(), length, &status); ++ udat_toPattern(dateFormat, true, buffer.data(), length, &status); + if (U_FAILURE(status)) + return emptyString(); + return String::adopt(buffer); +diff --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp +index dd6ff06..e0f4bd7 100644 +--- a/Source/WebCore/platform/text/TextCodecICU.cpp ++++ b/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) +diff --git a/Source/WebCore/platform/text/icu/UTextProvider.h b/Source/WebCore/platform/text/icu/UTextProvider.h +index c254fc4..6d1e1cb 100644 +--- a/Source/WebCore/platform/text/icu/UTextProvider.h ++++ b/Source/WebCore/platform/text/icu/UTextProvider.h +@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(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, int64_t nativeIndex, int + // Ensure chunk offset is well formed if computed offset exceeds int32_t range. + ASSERT(offset < std::numeric_limits::max()); + text->chunkOffset = offset < std::numeric_limits::max() ? static_cast(offset) : 0; +- isAccessible = TRUE; ++ isAccessible = true; + return true; + } + if (nativeIndex <= 0 && !text->chunkNativeStart) { + text->chunkOffset = 0; +- isAccessible = FALSE; ++ isAccessible = false; + return true; + } + } +diff --git a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +index cd6852c..6a864b1 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp +@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) + 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* uText, int64_t index, UBool forward) + + 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(UText* text) + 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, int64_t nativeIndex, UBo + 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) +diff --git a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +index 7aaac48..9ae0d36 100644 +--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp ++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp +@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) + 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, int64_t nativeIndex, UBoo + 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) +-- +2.30.2 diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200924.recipe b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200924.recipe index fffb75fbb..752dfff09 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200924.recipe +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0~pre20200924.recipe @@ -9,7 +9,7 @@ HOMEPAGE="https://www.qt.io" COPYRIGHT="2015-2020 The Qt Company Ltd." LICENSE="BSD (3-clause) GNU LGPL v2.1" -REVISION="1" +REVISION="2" srcGitRev="ac8ebc6c3a56064f88f5506e5e3783ab7bee2456" SOURCE_URI="https://github.com/qt/qtwebkit/archive/$srcGitRev.tar.gz" CHECKSUM_SHA256="405b32de1ac1921759190ef68b7dcb7620c545d0055a84ea8e1ba7b86b3d6dc4" @@ -56,6 +56,7 @@ REQUIRES=" lib:libQt5WebChannel$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix lib:libtasn1$secondaryArchSuffix lib:libwebp$secondaryArchSuffix lib:libxml2$secondaryArchSuffix