gentoo resync : 25.08.2020

7 files changed, 31 insertions, 274 deletions

diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
deleted file mode 100644
index 0f0959900df2..000000000000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add missing headers required during non-unified build.
-
-Unified build happens to get them included by the other sources unified
-into same source file, thus didn't fail.
-
-diff -urNp a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
---- a/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-+++ b/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp
-@@ -30,6 +30,7 @@
- 
- #include "BuiltinNames.h"
- #include "BytecodeGenerator.h"
-+#include "BytecodeStructs.h"
- #include "CallFrame.h"
- #include "JIT.h"
- #include "JSCInlines.h"
-diff -urNp a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
---- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-@@ -23,6 +23,7 @@
- #include "MachineStackMarker.h"
- 
- #include "ConservativeRoots.h"
-+#include "CPU.h"
- #include "MachineContext.h"
- #include <setjmp.h>
- #include <stdlib.h>
diff --git a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
deleted file mode 100644
index 85328be1a5ca..000000000000
--- a/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream commit 41455af5d76a726f195838846b61e1693a2da99c is supposed to fix this,
-but it looks like it's not enough with older perl-based gtk-doc.
-Keep this extra patch only until we can't depend on a newer gtk-doc version, which
-should be retested whether this patch is unnecessary then.
-
-Upstream extra reference for the above reference commit:
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245027 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-index 023b14c33f4..657b1febf5d 100644
---- a/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-+++ b/Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
-@@ -1505,7 +1505,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
-      * WebKitSettings:enable-media:
-      *
-      * Enable or disable support for media playback on pages. This setting is enabled by
--     * default. Disabling it means `<audio>`, `<track>` and `<video>` elements will have
-+     * default. Disabling it means audio, track and video elements will have
-      * playback support disabled.
-      *
-      * Since: 2.26
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch b/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch
deleted file mode 100644
index 96e4d7d0aa2c..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-fix-ppc64-JSC.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 46c7d3ea88dd77223f25c48ce4a8688db71c489b Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Thu, 7 May 2020 19:30:28 +0000
-Subject: [PATCH] REGRESSION(r251875): Crash in JSC::StructureIDTable::get on
- ppc64le: gcSafeMemcpy broken on JSVALUE64 platforms other than x86_64 and
- aarch64 https://bugs.webkit.org/show_bug.cgi?id=210685
-
-Patch by Daniel Kolesa <daniel@octaforge.org> on 2020-05-07
-Reviewed by Michael Catanzaro.
-
-Fix gcSafeMemcpy on non-x86_64/aarch64 64-bit architectures.
-
-We were hitting an incorrect x86_64 assertion on values larger than
-mediumCutoff on JSVALUE64 architectures other than x86_64 and aarch64,
-as the control flow is wrong.
-
-* heap/GCMemoryOperations.h:
-(JSC::gcSafeMemcpy):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261326 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/JavaScriptCore/heap/GCMemoryOperations.h | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/Source/JavaScriptCore/heap/GCMemoryOperations.h b/Source/JavaScriptCore/heap/GCMemoryOperations.h
-index f2b9e385bc9..ff66071db20 100644
---- a/Source/JavaScriptCore/heap/GCMemoryOperations.h
-+++ b/Source/JavaScriptCore/heap/GCMemoryOperations.h
-@@ -53,7 +53,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-             bitwise_cast<volatile uint64_t*>(dst)[i] = bitwise_cast<volatile uint64_t*>(src)[i];
-     };
- 
--#if COMPILER(GCC_COMPATIBLE) && USE(JSVALUE64)
-+#if COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
-     if (bytes <= smallCutoff)
-         slowPathForwardMemcpy();
-     else if (isARM64() || bytes <= mediumCutoff) {
-@@ -121,8 +121,6 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-             :
-             : "d0", "d1", "memory"
-         );
--#else
--    slowPathForwardMemcpy();
- #endif // CPU(X86_64)
-     } else {
-         RELEASE_ASSERT(isX86_64());
-@@ -139,7 +137,7 @@ ALWAYS_INLINE void gcSafeMemcpy(T* dst, T* src, size_t bytes)
-     }
- #else
-     slowPathForwardMemcpy();
--#endif // COMPILER(GCC_COMPATIBLE)
-+#endif // COMPILER(GCC_COMPATIBLE) && (CPU(X86_64) || CPU(ARM64))
- #else
-     memcpy(dst, src, bytes);
- #endif // USE(JSVALUE64)
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch b/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch
deleted file mode 100644
index fdf9d7d4d20b..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-fix-yelp-desktopless-build.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9cd4011a12bf658aad3776251792bacdc894643a Mon Sep 17 00:00:00 2001
-From: "berto@igalia.com"
- <berto@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Mon, 27 Apr 2020 11:52:10 +0000
-Subject: [PATCH] [GTK] [2.28.0] The Yelp build crashes if DISPLAY is not set
- https://bugs.webkit.org/show_bug.cgi?id=209431
-
-Reviewed by Carlos Garcia Campos.
-
-Don't create a PlatformDisplayLibWPE as a fallback when using
-Wayland or X11.
-
-* platform/graphics/PlatformDisplay.cpp:
-(WebCore::PlatformDisplay::createPlatformDisplay):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260750 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- Source/WebCore/platform/graphics/PlatformDisplay.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Source/WebCore/platform/graphics/PlatformDisplay.cpp b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-index 8bb47ca2b77..f9547b3af69 100644
---- a/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-+++ b/Source/WebCore/platform/graphics/PlatformDisplay.cpp
-@@ -98,12 +98,6 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
-     }
- #endif // PLATFORM(GTK)
- 
--#if USE(WPE_RENDERER)
--    return PlatformDisplayLibWPE::create();
--#elif PLATFORM(WIN)
--    return PlatformDisplayWin::create();
--#endif
--
- #if PLATFORM(WAYLAND)
-     if (auto platformDisplay = PlatformDisplayWayland::create())
-         return platformDisplay;
-@@ -121,6 +115,12 @@ std::unique_ptr<PlatformDisplay> PlatformDisplay::createPlatformDisplay()
-     return PlatformDisplayX11::create(nullptr);
- #endif
- 
-+#if USE(WPE_RENDERER)
-+    return PlatformDisplayLibWPE::create();
-+#elif PLATFORM(WIN)
-+    return PlatformDisplayWin::create();
-+#endif
-+
-     RELEASE_ASSERT_NOT_REACHED();
- }
- 
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch b/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch
deleted file mode 100644
index f4bc7291a809..000000000000
--- a/net-libs/webkit-gtk/files/2.28.2-use-gst-audiointerleave.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 43686247013a1230d47b46d637f928eb47c99609 Mon Sep 17 00:00:00 2001
-From: "commit-queue@webkit.org"
- <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Wed, 29 Apr 2020 08:14:06 +0000
-Subject: [PATCH] [GStreamer] Switch to audiointerleave
- https://bugs.webkit.org/show_bug.cgi?id=211124
-
-Patch by Philippe Normand <pnormand@igalia.com> on 2020-04-29
-Reviewed by Xabier Rodriguez-Calvar.
-
-The audiointerleave element is a drop-in replacement of
-interleave. It should behave a bit better in live.
-
-No new tests, existing webaudio tests cover this change.
-
-* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
-(webKitWebAudioSrcConstructed):
-(webKitWebAudioSrcChangeState):
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- .../audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp     | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-index 2f937f677cc..ea134b7b1b2 100644
---- a/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-+++ b/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
-@@ -211,10 +211,10 @@ static void webKitWebAudioSrcConstructed(GObject* object)
-     ASSERT(priv->provider);
-     ASSERT(priv->sampleRate);
- 
--    priv->interleave = gst_element_factory_make("interleave", nullptr);
-+    priv->interleave = gst_element_factory_make("audiointerleave", nullptr);
- 
-     if (!priv->interleave) {
--        GST_ERROR_OBJECT(src, "Failed to create interleave");
-+        GST_ERROR_OBJECT(src, "Failed to create audiointerleave");
-         return;
-     }
- 
-@@ -398,8 +398,8 @@ static GstStateChangeReturn webKitWebAudioSrcChangeState(GstElement* element, Gs
-     switch (transition) {
-     case GST_STATE_CHANGE_NULL_TO_READY:
-         if (!src->priv->interleave) {
--            gst_element_post_message(element, gst_missing_element_message_new(element, "interleave"));
--            GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no interleave"));
-+            gst_element_post_message(element, gst_missing_element_message_new(element, "audiointerleave"));
-+            GST_ELEMENT_ERROR(src, CORE, MISSING_PLUGIN, (nullptr), ("no audiointerleave"));
-             return GST_STATE_CHANGE_FAILURE;
-         }
-         src->priv->numberOfSamples = 0;
--- 
-2.20.1
-
diff --git a/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
new file mode 100644
index 000000000000..d7bc379d2b15
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.28.4-non-jumbo-fix2.patch
@@ -0,0 +1,31 @@
+From f6b0ae5334eb9de1858b5f3b0edc2f7245087cab Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sat, 11 Jul 2020 15:28:05 +0300
+Subject: [PATCH] Try to fix another apparent non-unified build error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Source/WebCore/rendering/svg/RenderSVGResourceClipper.h:70:42:   required from here
+/usr/lib/gcc/x86_64-pc-linux-gnu/9.2.0/include/g++-v9/bits/unique_ptr.h:79:16: error: invalid application of ‘sizeof’ to incomplete type ‘WebCore::ImageBuffer’
+   79 |  static_assert(sizeof(_Tp)>0,
+      |                ^~~~~~~~~~~
+---
+ Source/WebCore/rendering/svg/RenderSVGResourceClipper.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+index 55d9e34df61..12a7a83cc61 100644
+--- a/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
++++ b/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h
+@@ -19,6 +19,7 @@
+ 
+ #pragma once
+ 
++#include "ImageBuffer.h"
+ #include "RenderSVGResourceContainer.h"
+ #include "SVGClipPathElement.h"
+ #include "SVGUnitTypes.h"
+-- 
+2.20.1
+
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
deleted file mode 100644
index 475c9851e637..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.24.4-icu-65.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9b60e834454dc93f46f05b1cfdc0aad0c6b7de97 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Fri, 4 Oct 2019 22:17:11 +0200
-Subject: [PATCH] Add missing semicolons to fix build with icu 65.1
-
----
- Source/WTF/wtf/URLHelpers.cpp   |  2 +-
- Source/WebCore/dom/Document.cpp |  6 +++---
- 4 files changed, 25 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WTF/wtf/URLHelpers.cpp b/Source/WTF/wtf/URLHelpers.cpp
-index 18e7f13cd61..c584f1a0cb7 100644
---- a/Source/WTF/wtf/URLHelpers.cpp
-+++ b/Source/WTF/wtf/URLHelpers.cpp
-@@ -301,7 +301,7 @@ static bool allCharactersInIDNScriptWhiteList(const UChar* buffer, int32_t lengt
-     Optional<UChar32> previousCodePoint;
-     while (i < length) {
-         UChar32 c;
--        U16_NEXT(buffer, i, length, c)
-+        U16_NEXT(buffer, i, length, c);
-         UErrorCode error = U_ZERO_ERROR;
-         UScriptCode script = uscript_getScript(c, &error);
-         if (error != U_ZERO_ERROR) {
-diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
-index 0fd0fa090bf..01f76850f3d 100644
---- a/Source/WebCore/dom/Document.cpp
-+++ b/Source/WebCore/dom/Document.cpp
-@@ -4954,12 +4954,12 @@ static bool isValidNameNonASCII(const UChar* characters, unsigned length)
-     unsigned i = 0;
- 
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (!isValidNameStart(c))
-         return false;
- 
-     while (i < length) {
--        U16_NEXT(characters, i, length, c)
-+        U16_NEXT(characters, i, length, c);
-         if (!isValidNamePart(c))
-             return false;
-     }
-@@ -5019,7 +5019,7 @@ ExceptionOr<std::pair<AtomString, AtomString>> Document::parseQualifiedName(cons
- 
-     for (unsigned i = 0; i < length; ) {
-         UChar32 c;
--        U16_NEXT(qualifiedName, i, length, c)
-+        U16_NEXT(qualifiedName, i, length, c);
-         if (c == ':') {
-             if (sawColon)
-                 return Exception { InvalidCharacterError };
--- 
-2.23.0