pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt5-qtwebkit qt5-qtwebkit: fix build with icu-68 b...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a2b3e7833108
branches: trunk
changeset: 441609:a2b3e7833108
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Nov 07 09:23:55 2020 +0000
description:
qt5-qtwebkit: fix build with icu-68 based on webkit-gtk patches
diffstat:
x11/qt5-qtwebkit/distinfo | 6 +-
x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp | 15 ++
x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h | 36 +++++
x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp | 61 ++++++++++
x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp | 24 +++
5 files changed, 141 insertions(+), 1 deletions(-)
diffs (171 lines):
diff -r 6fd43da8d403 -r a2b3e7833108 x11/qt5-qtwebkit/distinfo
--- a/x11/qt5-qtwebkit/distinfo Sat Nov 07 09:06:32 2020 +0000
+++ b/x11/qt5-qtwebkit/distinfo Sat Nov 07 09:23:55 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2020/08/29 16:26:06 wiz Exp $
+$NetBSD: distinfo,v 1.18 2020/11/07 09:23:55 wiz Exp $
SHA1 (qtwebkit-5.212.0-alpha4.tar.xz) = a2e2840cd751013f6e9fd0d15601d1ea4beb81d5
RMD160 (qtwebkit-5.212.0-alpha4.tar.xz) = af000947daa429945d80e3c23e5cfd0eb13793be
@@ -23,5 +23,9 @@
SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = ec7c7533c2d5a4258170745bfc49655848d0780c
SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352
SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf
+SHA1 (patch-Source_WebCore_platform_text_TextCodecICU.cpp) = 4b3418cedac05d7f4b2fad4df09df2c7b4b46b3f
+SHA1 (patch-Source_WebCore_platform_text_icu_UTextProvider.h) = fb0885eb9db3001ddd8df90059cdb47dbfd79fe3
+SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 29b414e1ae18a0786f31d80143f665d6d68bcbe3
+SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = b175e1973a2019d746fda174dfc5708a3ca57d9b
SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
SHA1 (patch-Source_cmake_OptionsQt.cmake) = 35cc2b9904897cd2f1d540b473ce2905d95a0143
diff -r 6fd43da8d403 -r a2b3e7833108 x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp Sat Nov 07 09:23:55 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_WebCore_platform_text_TextCodecICU.cpp,v 1.1 2020/11/07 09:23:55 wiz Exp $
+
+Compatibility with icu-68.
+
+--- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37.000000000 +0000
++++ 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, true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
diff -r 6fd43da8d403 -r a2b3e7833108 x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h Sat Nov 07 09:23:55 2020 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-Source_WebCore_platform_text_icu_UTextProvider.h,v 1.1 2020/11/07 09:23:55 wiz Exp $
+
+Compatibility with icu-68.
+
+--- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37.000000000 +0000
++++ 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 = 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 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 = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
diff -r 6fd43da8d403 -r a2b3e7833108 x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp Sat Nov 07 09:23:55 2020 +0000
@@ -0,0 +1,61 @@
+$NetBSD: patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp,v 1.1 2020/11/07 09:23:55 wiz Exp $
+
+Compatibility with icu-68.
+
+--- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37.000000000 +0000
++++ 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 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* 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)
+@@ -336,7 +336,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))
+@@ -356,7 +356,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)
diff -r 6fd43da8d403 -r a2b3e7833108 x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp Sat Nov 07 09:23:55 2020 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp,v 1.1 2020/11/07 09:23:55 wiz Exp $
+
+Compatibility with icu-68.
+
+--- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37.000000000 +0000
++++ 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 false;
+ 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 true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
Home |
Main Index |
Thread Index |
Old Index