diff --git a/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch b/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch deleted file mode 100644 index 3f4c204..0000000 --- a/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 8d1c44a03c1870912991467f8d8cd8bb6f85efa5 Mon Sep 17 00:00:00 2001 -From: "stephan.szabo@sony.com" -Date: Tue, 3 Nov 2020 20:06:15 +0000 -Subject: [PATCH] ICU 68.1 no longer exposes FALSE and TRUE macros by default - https://bugs.webkit.org/show_bug.cgi?id=218522 - -Reviewed by Don Olmstead. - -Source/WebCore: - -* platform/text/TextCodecICU.cpp: Replace use of TRUE with true - -Source/WebKit: - -* UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp: Replace FALSE with false - -Source/WTF: - -Replace uses of FALSE and TRUE with false and true. - -* wtf/text/icu/UTextProvider.h: -* wtf/text/icu/UTextProviderLatin1.cpp: -* wtf/text/icu/UTextProviderUTF16.cpp: - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269325 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/WTF/wtf/text/icu/UTextProvider.h | 8 ++++---- - Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp | 14 +++++++------- - Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp | 4 ++-- - Source/WebCore/platform/text/TextCodecICU.cpp | 2 +- - .../DrawingAreaProxyCoordinatedGraphics.cpp | 2 +- - 5 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/Source/WTF/wtf/text/icu/UTextProvider.h b/Source/WTF/wtf/text/icu/UTextProvider.h -index c8f28d6e..3c6fbeab 100644 ---- a/Source/WTF/wtf/text/icu/UTextProvider.h -+++ b/Source/WTF/wtf/text/icu/UTextProvider.h -@@ -79,12 +79,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // 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 { -@@ -93,12 +93,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text, int64_t nativeIndex, int - // 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; - } - } -diff --git a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -index 0a646b7f..49980f95 100644 ---- a/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -+++ b/Source/WTF/wtf/text/icu/UTextProviderLatin1.cpp -@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t index, UBool forward) - 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* uText, int64_t index, UBool forward) - - 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 uTextLatin1ContextAwareNativeLength(UText* text) - 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 uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBo - 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 --git a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -index 69c8d091..9c3fa709 100644 ---- a/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -+++ b/Source/WTF/wtf/text/icu/UTextProviderUTF16.cpp -@@ -126,7 +126,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLength(UText* text) - 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 uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBoo - 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 --git a/Source/WebCore/platform/text/TextCodecICU.cpp b/Source/WebCore/platform/text/TextCodecICU.cpp -index c2684939..e716a6fb 100644 ---- a/Source/WebCore/platform/text/TextCodecICU.cpp -+++ b/Source/WebCore/platform/text/TextCodecICU.cpp -@@ -240,7 +240,7 @@ void TextCodecICU::createICUConverter() const - 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 --git a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -index 61e3f605..5a51b9ec 100644 ---- a/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -+++ b/Source/WebKit/UIProcess/CoordinatedGraphics/DrawingAreaProxyCoordinatedGraphics.cpp -@@ -402,7 +402,7 @@ DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::~DrawingMonitor() - int DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::webViewDrawCallback(DrawingAreaProxyCoordinatedGraphics::DrawingMonitor* monitor) - { - monitor->didDraw(); -- return FALSE; -+ return false; - } - - void DrawingAreaProxyCoordinatedGraphics::DrawingMonitor::start(WTF::Function&& callback) --- -2.25.1 - diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index e864a57..2415a20 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Dec 15 14:06:42 UTC 2020 - Dominique Leuenberger + +- Update to version 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. +- Drop upstream merged patch: + + 0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch + ------------------------------------------------------------------- Thu Dec 3 22:23:20 UTC 2020 - Michael Gorse diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index cd66a2a..977cbd4 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -31,7 +31,7 @@ %define _gold_linker 0 %endif Name: webkit2gtk3 -Version: 2.30.3 +Version: 2.30.4 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0-or-later AND BSD-3-Clause @@ -43,8 +43,6 @@ Source98: baselibs.conf Source99: webkit2gtk3.keyring # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 firefox. Patch0: no-forced-sse.patch -# PATCH-FIX-UPSTREAM 0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch dimstar@opensuse.org -- ICU 68.1 no longer exposes FALSE and TRUE macros by default -Patch1: http://git.yoctoproject.org/cgit/cgit.cgi/poky/plain/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch # Below patches are for 15.0/15.1 only # PATCH-FIX-OPENSUSE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary. Patch100: webkit-process.patch @@ -277,7 +275,6 @@ A small test browswer from webkit, useful for testing features. %prep %setup -n webkitgtk-%{version} %patch0 -p1 -%patch1 -p1 %if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200 %patch100 -p1 %patch101 -p1 diff --git a/webkitgtk-2.30.3.tar.xz b/webkitgtk-2.30.3.tar.xz deleted file mode 100644 index fed948d..0000000 --- a/webkitgtk-2.30.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dea14f03916882816f2fed9497a5103fc54b2ab8602ab145ca991e4951e5e7f -size 22311704 diff --git a/webkitgtk-2.30.3.tar.xz.asc b/webkitgtk-2.30.3.tar.xz.asc deleted file mode 100644 index ff67258..0000000 --- a/webkitgtk-2.30.3.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCX7e4fAAKCRDz0yLQ7EWC -w7QFAJ0TZ5TPL8OizAGVM9Qx+g+ZFOzAWACeKFPcwRUnpEQhtyL2sOKZ4pxV7mA= -=EEPd ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.30.4.tar.xz b/webkitgtk-2.30.4.tar.xz new file mode 100644 index 0000000..0224d3c --- /dev/null +++ b/webkitgtk-2.30.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d595a37c5001ff787266b155e303a5f2e5b48a6d466f2714c2f30c11392f7b24 +size 22310784 diff --git a/webkitgtk-2.30.4.tar.xz.asc b/webkitgtk-2.30.4.tar.xz.asc new file mode 100644 index 0000000..66ecf88 --- /dev/null +++ b/webkitgtk-2.30.4.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCX9jB/wAKCRDz0yLQ7EWC +wwMHAKDpOxq2Q7JYkdPOxLypCBsvQz9w4gCgtm1WNriq/GO3kCNO8RIjhsBQXCs= +=lW3V +-----END PGP SIGNATURE-----