pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/webkit-gtk webkit-gtk: Update to 2.30.4
details: https://anonhg.NetBSD.org/pkgsrc/rev/59f72229fa90
branches: trunk
changeset: 443550:59f72229fa90
user: leot <leot%pkgsrc.org@localhost>
date: Tue Dec 15 17:59:00 2020 +0000
description:
webkit-gtk: Update to 2.30.4
pkgsrc changes:
- Remove ICU 68.1 patches applied upstream
Changes:
WebKitGTK 2.30.4
================
- Fix text data sent with WebSockets when using libsoup < 2.68.
- Fix the rendering on Raspberry Pi 3 using the proprietary video driver.
- Fix clipping of descedant layers of a mask layer.
- Fix the build with ICU 68.1.
diffstat:
www/webkit-gtk/Makefile | 4 +-
www/webkit-gtk/PLIST | 6 +-
www/webkit-gtk/distinfo | 15 +-
www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProvider.h | 39 ------
www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp | 64 ----------
www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp | 27 ----
www/webkit-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp | 18 --
www/webkit-gtk/patches/patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp | 18 --
8 files changed, 10 insertions(+), 181 deletions(-)
diffs (262 lines):
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/Makefile
--- a/www/webkit-gtk/Makefile Tue Dec 15 16:50:33 2020 +0000
+++ b/www/webkit-gtk/Makefile Tue Dec 15 17:59:00 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.198 2020/11/20 14:33:14 leot Exp $
+# $NetBSD: Makefile,v 1.199 2020/12/15 17:59:00 leot Exp $
-DISTNAME= webkitgtk-2.30.3
+DISTNAME= webkitgtk-2.30.4
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
CATEGORIES= www
MASTER_SITES= https://www.webkitgtk.org/releases/
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/PLIST
--- a/www/webkit-gtk/PLIST Tue Dec 15 16:50:33 2020 +0000
+++ b/www/webkit-gtk/PLIST Tue Dec 15 17:59:00 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.66 2020/11/20 14:33:14 leot Exp $
+@comment $NetBSD: PLIST,v 1.67 2020/12/15 17:59:00 leot Exp $
bin/WebKitWebDriver
include/webkitgtk-4.0/JavaScriptCore/JSBase.h
include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -218,10 +218,10 @@
${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
lib/libjavascriptcoregtk-4.0.so
lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.17.11
+lib/libjavascriptcoregtk-4.0.so.18.17.12
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.49.7
+lib/libwebkit2gtk-4.0.so.37.49.8
lib/pkgconfig/javascriptcoregtk-4.0.pc
lib/pkgconfig/webkit2gtk-4.0.pc
lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/distinfo
--- a/www/webkit-gtk/distinfo Tue Dec 15 16:50:33 2020 +0000
+++ b/www/webkit-gtk/distinfo Tue Dec 15 17:59:00 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.142 2020/11/20 14:33:14 leot Exp $
+$NetBSD: distinfo,v 1.143 2020/12/15 17:59:00 leot Exp $
-SHA1 (webkitgtk-2.30.3.tar.xz) = 6eed6e8a3c2f47533821169679fe381ceb0550be
-RMD160 (webkitgtk-2.30.3.tar.xz) = e18f71585da565f34ae0256c8f63acffdc6ae96b
-SHA512 (webkitgtk-2.30.3.tar.xz) = cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf
-Size (webkitgtk-2.30.3.tar.xz) = 22311704 bytes
+SHA1 (webkitgtk-2.30.4.tar.xz) = 330f45d7badf944fb01a3238ebb2ceaad8c2a91f
+RMD160 (webkitgtk-2.30.4.tar.xz) = ea588aa4436262f93aa4972d85c45ec0ee9150ad
+SHA512 (webkitgtk-2.30.4.tar.xz) = dff9e3bd17de8481d940a48b0697458a0c1c71a987f4d50ee7bc46b0203ed6802a9ec82c3a21ea9b7211ab900fa75b89b2a05b0ca6aed319ad66ec317d02c571
+Size (webkitgtk-2.30.4.tar.xz) = 22310784 bytes
SHA1 (patch-CMakeLists.txt) = 38d2957bb0f4573654adc0dc62b19d0fdbdbd496
SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528
SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
@@ -23,15 +23,11 @@
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
@@ -41,7 +37,6 @@
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
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProvider.h
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProvider.h Tue Dec 15 16:50:33 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$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;
- }
- }
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderLatin1.cpp Tue Dec 15 16:50:33 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-$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)
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp
--- a/www/webkit-gtk/patches/patch-Source_WTF_wtf_text_icu_UTextProviderUTF16.cpp Tue Dec 15 16:50:33 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$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)
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp
--- a/www/webkit-gtk/patches/patch-Source_WebCore_platform_text_TextCodecICU.cpp Tue Dec 15 16:50:33 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$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)
diff -r 61f012fbe0c4 -r 59f72229fa90 www/webkit-gtk/patches/patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp
--- a/www/webkit-gtk/patches/patch-Source_WebKit_UIProcess_CoordinatedGraphics_DrawingAreaProxyCoordinatedGraphics.cpp Tue Dec 15 16:50:33 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$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