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 10A391A9246 for ; Sat, 7 Nov 2020 02:59:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5491484D2E; Sat, 7 Nov 2020 02:59:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8D5D984CEE for ; Sat, 7 Nov 2020 02:59:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 7qk2Sqlhh6-W for ; Sat, 7 Nov 2020 02:59:45 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id AEC4E84CE1 for ; Sat, 7 Nov 2020 02:59:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A7F0AFB28; Sat, 7 Nov 2020 02:59:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1604717985222210" MIME-Version: 1.0 Date: Sat, 7 Nov 2020 02:59:45 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/www/webkit24-gtk To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20201107025945.A7F0AFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1604717985222210 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Sat Nov 7 02:59:45 UTC 2020 Modified Files: pkgsrc/www/webkit24-gtk: distinfo Added Files: pkgsrc/www/webkit24-gtk/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: webkit24-gtk, webkit24-gtk3: Fix build with textproc/icu-68.1 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/webkit24-gtk/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp \ pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h \ pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp \ pkgsrc/www/webkit24-gtk/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. --_----------=_1604717985222210 Content-Disposition: inline Content-Length: 9276 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/webkit24-gtk/distinfo diff -u pkgsrc/www/webkit24-gtk/distinfo:1.12 pkgsrc/www/webkit24-gtk/distinfo:1.13 --- pkgsrc/www/webkit24-gtk/distinfo:1.12 Mon Sep 14 18:19:16 2020 +++ pkgsrc/www/webkit24-gtk/distinfo Sat Nov 7 02:59:45 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2020/09/14 18:19:16 joerg Exp $ +$NetBSD: distinfo,v 1.13 2020/11/07 02:59:45 ryoon Exp $ SHA1 (webkitgtk-2.4.11.tar.xz) = e425ae86084ab6335dadb368c9e8f53600665d54 RMD160 (webkitgtk-2.4.11.tar.xz) = e1f72498f911465f5ba152313dd9c62ae8d5eee6 @@ -22,6 +22,10 @@ SHA1 (patch-Source_WebCore_css_makegramm SHA1 (patch-Source_WebCore_dom_Document.cpp) = c7f810b09a17b0a0e7534cfeacc7a2f2ac833c60 SHA1 (patch-Source_WebCore_platform_graphics_SegmentedFontData.cpp) = dd37d10a794d832e87b4074ff08e8f2f2630b0e7 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = 6d3b9ee1559a18c17229698e44246f13c77278c9 +SHA1 (patch-Source_WebCore_platform_text_TextCodecICU.cpp) = f0f3dc1bbed6fed2d1614114df7aa19d7f25a86c +SHA1 (patch-Source_WebCore_platform_text_icu_UTextProvider.h) = a1fed5b0c7846b6df45bdde6031771850d931422 +SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 356e698ea77b681bfc765527c13175e4bcd5e5ea +SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = 741bb400e32192848a4fdef8b8e0b207f3daa937 SHA1 (patch-Source_autotools_SetupCompilerFlags.m4) = 2802b09bc3bcb92a291f471cef4f3dbf6201a582 SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91 SHA1 (patch-ai) = 8e174c68e4ba06fdd6edd64fd6df3328faf9055f Added files: Index: pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp diff -u /dev/null pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp:1.1 --- /dev/null Sat Nov 7 02:59:45 2020 +++ pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp Sat Nov 7 02:59:45 2020 @@ -0,0 +1,13 @@ +$NetBSD: patch-Source_WebCore_platform_text_TextCodecICU.cpp,v 1.1 2020/11/07 02:59:45 ryoon Exp $ + +--- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2016-04-10 06:48: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/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h diff -u /dev/null pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h:1.1 --- /dev/null Sat Nov 7 02:59:45 2020 +++ pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h Sat Nov 7 02:59:45 2020 @@ -0,0 +1,36 @@ +$NetBSD: patch-Source_WebCore_platform_text_icu_UTextProvider.h,v 1.1 2020/11/07 02:59:45 ryoon Exp $ + +* Fix build with textproc/icu-68.1. + +--- Source/WebCore/platform/text/icu/UTextProvider.h.orig 2016-04-10 06:48:37.000000000 +0000 ++++ Source/WebCore/platform/text/icu/UTextProvider.h +@@ -81,12 +81,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 { +@@ -95,12 +95,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/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp diff -u /dev/null pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp:1.1 --- /dev/null Sat Nov 7 02:59:45 2020 +++ pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp Sat Nov 7 02:59:45 2020 @@ -0,0 +1,59 @@ +$NetBSD: patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp,v 1.1 2020/11/07 02:59:45 ryoon Exp $ + +--- Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2016-04-10 06:48: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/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp diff -u /dev/null pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp:1.1 --- /dev/null Sat Nov 7 02:59:45 2020 +++ pkgsrc/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp Sat Nov 7 02:59:45 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp,v 1.1 2020/11/07 02:59:45 ryoon Exp $ + +--- Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2015-07-22 12:37:57.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) --_----------=_1604717985222210--