pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/webkit-gtk
Module Name: pkgsrc
Committed By: leot
Date: Fri Nov 6 22:21:35 UTC 2020
Modified Files:
pkgsrc/www/webkit-gtk: distinfo
Added Files:
pkgsrc/www/webkit-gtk/patches:
patch-Source_WTF_wtf_text_icu_UTextProvider.h
patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp
patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp
patch-Source_WebCore_platform_text_TextCodecICU.cpp
patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp
Log Message:
webkit-gtk: Backport patches needed for building with ICU 68.1
>From upstream changeset 269325.
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 pkgsrc/www/webkit-gtk/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProvider.h \
pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp \
pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp \
pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp \
pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/webkit-gtk/distinfo
diff -u pkgsrc/www/webkit-gtk/distinfo:1.140 pkgsrc/www/webkit-gtk/distinfo:1.141
--- pkgsrc/www/webkit-gtk/distinfo:1.140 Fri Oct 23 15:01:48 2020
+++ pkgsrc/www/webkit-gtk/distinfo Fri Nov 6 22:21:35 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.140 2020/10/23 15:01:48 leot Exp $
+$NetBSD: distinfo,v 1.141 2020/11/06 22:21:35 leot Exp $
SHA1 (webkitgtk-2.30.2.tar.xz) = e27d336570226645f861b5a00116c17da39f9df4
RMD160 (webkitgtk-2.30.2.tar.xz) = 9544d4796cfb33bae33c41719764a775b3b6bd29
@@ -23,11 +23,15 @@ SHA1 (patch-Source_WTF_wtf_PlatformOS.h)
SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = c4fd7f67cbb414318577c93d642f26827ba638c0
SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
+SHA1 (patch-Source_WTF_wtf_text_icu_UTextProvider.h) = 9ff5aa3ffcec45866106a99b2bc0bdd656b0ff9e
+SHA1 (patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp) = bb5bf01d8a4ab78d2fd16bbb84d4dc46f13313ee
+SHA1 (patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp) = 74b5c0b87da1b0acf8ca3324cfbad55cf73294d2
SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
+SHA1 (patch-Source_WebCore_platform_text_TextCodecICU.cpp) = a3ac5b8ed98c52a50581fffc52394a46255d22bc
SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e
SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
@@ -37,6 +41,7 @@ SHA1 (patch-Source_WebKit_Platform_IPC_u
SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
+SHA1 (patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp) = 42086291df0fc2d691feeea9668d8452aff4b79e
SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = b1eb6ab93f2ce272cfee94a544d19806feb9a625
SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
Added files:
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProvider.h
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProvider.h:1.1
--- /dev/null Fri Nov 6 22:21:35 2020
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProvider.h Fri Nov 6 22:21:35 2020
@@ -0,0 +1,39 @@
+$NetBSD: patch-Source_WTF_wtf_text_icu_UTextProvider.h,v 1.1 2020/11/06 22:21:35 leot Exp $
+
+Backport upstream changeset 269325.
+
+[WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and TRUE
+macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
+
+--- Source/WTF/wtf/text/icu/UTextProvider.h.orig 2020-08-12 09:17:54.000000000 +0000
++++ Source/WTF/wtf/text/icu/UTextProvider.h
+@@ -79,12 +79,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 {
+@@ -93,12 +93,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;
+ }
+ }
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp:1.1
--- /dev/null Fri Nov 6 22:21:35 2020
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp Fri Nov 6 22:21:35 2020
@@ -0,0 +1,64 @@
+$NetBSD: patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp,v 1.1 2020/11/06 22:21:35 leot Exp $
+
+Backport upstream changeset 269325.
+
+[WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and TRUE
+macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
+
+--- Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp.orig 2020-08-12 09:17:54.000000000 +0000
++++ Source/WTF/wtf/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)
+@@ -337,7 +337,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))
+@@ -357,7 +357,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/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp:1.1
--- /dev/null Fri Nov 6 22:21:35 2020
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp Fri Nov 6 22:21:35 2020
@@ -0,0 +1,27 @@
+$NetBSD: patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp,v 1.1 2020/11/06 22:21:35 leot Exp $
+
+Backport upstream changeset 269325.
+
+[WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and TRUE
+macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
+
+--- Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp.orig 2020-08-12 09:17:54.000000000 +0000
++++ Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp
+@@ -126,7 +126,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))
+@@ -146,7 +146,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)
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp:1.1
--- /dev/null Fri Nov 6 22:21:35 2020
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp Fri Nov 6 22:21:35 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-Source_WebCore_platform_text_TextCodecICU.cpp,v 1.1 2020/11/06 22:21:35 leot Exp $
+
+Backport upstream changeset 269325.
+
+[WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and TRUE
+macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
+
+--- Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-08-12 09:17:55.000000000 +0000
++++ Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -240,7 +240,7 @@ void TextCodecICU::createICUConverter()
+ UErrorCode error = U_ZERO_ERROR;
+ m_converter = ICUConverterPtr { ucnv_open(m_canonicalConverterName, &error), ucnv_close };
+ if (m_converter)
+- ucnv_setFallback(m_converter.get(), TRUE);
++ ucnv_setFallback(m_converter.get(), true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& error)
Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp
diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp:1.1
--- /dev/null Fri Nov 6 22:21:35 2020
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp Fri Nov 6 22:21:35 2020
@@ -0,0 +1,18 @@
+$NetBSD: patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp,v 1.1 2020/11/06 22:21:35 leot Exp $
+
+Backport upstream changeset 269325.
+
+[WinCairo/PlayStation] ICU 68.1 no longer exposes FALSE and TRUE
+macros by default https://bugs.webkit.org/show_bug.cgi?id=218522
+
+--- Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp.orig 2020-08-12 09:17:56.000000000 +0000
++++ Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp
+@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::Dra
+ int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor)
+ {
+ monitor->didDraw();
+- return FALSE;
++ return false;
+ }
+
+ void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function<void(CallbackBase::Error)>&& callback)
Home |
Main Index |
Thread Index |
Old Index