Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id A0D281A925D for ; Sat, 7 Nov 2020 09:23:58 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id E040A84D51; Sat, 7 Nov 2020 09:23:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2485984D2E for ; Sat, 7 Nov 2020 09:23:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id lDLWFfOoHvBG for ; Sat, 7 Nov 2020 09:23:56 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3762E84CE1 for ; Sat, 7 Nov 2020 09:23:56 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2BFB6FB28; Sat, 7 Nov 2020 09:23:56 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1604741036130320" MIME-Version: 1.0 Date: Sat, 7 Nov 2020 09:23:56 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/qt5-qtwebkit To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20201107092356.2BFB6FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1604741036130320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Nov 7 09:23:56 UTC 2020 Modified Files: pkgsrc/x11/qt5-qtwebkit: distinfo Added Files: pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_WebCore_platform_text_TextCodecICU.cpp patch-Source_WebCore_platform_text_icu_UTextProvider.h patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp Log Message: qt5-qtwebkit: fix build with icu-68 based on webkit-gtk patches To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/qt5-qtwebkit/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp \ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1604741036130320 Content-Disposition: inline Content-Length: 9332 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtwebkit/distinfo diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.17 pkgsrc/x11/qt5-qtwebkit/distinfo:1.18 --- pkgsrc/x11/qt5-qtwebkit/distinfo:1.17 Sat Aug 29 16:26:06 2020 +++ pkgsrc/x11/qt5-qtwebkit/distinfo Sat Nov 7 09:23:55 2020 @@ -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_page_Navigato 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 Added files: Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp:1.1 --- /dev/null Sat Nov 7 09:23:56 2020 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp Sat Nov 7 09:23:55 2020 @@ -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) Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h:1.1 --- /dev/null Sat Nov 7 09:23:56 2020 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h Sat Nov 7 09:23:55 2020 @@ -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::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 uTextAccessInChunkOrOutOfRan + // 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; + } + } Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp:1.1 --- /dev/null Sat Nov 7 09:23:56 2020 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp Sat Nov 7 09:23:55 2020 @@ -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(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* 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) Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp:1.1 --- /dev/null Sat Nov 7 09:23:56 2020 +++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp Sat Nov 7 09:23:55 2020 @@ -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) --_----------=_1604741036130320--