pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/webkit24-gtk webkit24-gtk, webkit24-gtk3: Fix buil...
details: https://anonhg.NetBSD.org/pkgsrc/rev/95f839013e62
branches: trunk
changeset: 441605:95f839013e62
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Sat Nov 07 02:59:45 2020 +0000
description:
webkit24-gtk, webkit24-gtk3: Fix build with textproc/icu-68.1
diffstat:
www/webkit24-gtk/distinfo | 6 +-
www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp | 13 ++
www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h | 36 ++++++
www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp | 59 ++++++++++
www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp | 22 +++
5 files changed, 135 insertions(+), 1 deletions(-)
diffs (166 lines):
diff -r c7e36d529d8e -r 95f839013e62 www/webkit24-gtk/distinfo
--- a/www/webkit24-gtk/distinfo Fri Nov 06 23:45:23 2020 +0000
+++ b/www/webkit24-gtk/distinfo Sat Nov 07 02:59:45 2020 +0000
@@ -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_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
diff -r c7e36d529d8e -r 95f839013e62 www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp Sat Nov 07 02:59:45 2020 +0000
@@ -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)
diff -r c7e36d529d8e -r 95f839013e62 www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProvider.h Sat Nov 07 02:59:45 2020 +0000
@@ -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<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 {
+@@ -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<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 c7e36d529d8e -r 95f839013e62 www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp Sat Nov 07 02:59:45 2020 +0000
@@ -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<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 c7e36d529d8e -r 95f839013e62 www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/www/webkit24-gtk/patches/patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp Sat Nov 07 02:59:45 2020 +0000
@@ -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)
Home |
Main Index |
Thread Index |
Old Index