net-libs/webkit-gtk : version bump

5 files changed, 93 insertions, 84 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
new file mode 100644
index 00000000..0f095990
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.2-fix-arm-non-unified-build.patch
@@ -0,0 +1,27 @@
+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.2-fix-noGL-build.patch b/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
deleted file mode 100644
index 422c71a4..00000000
--- a/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0fb66b8787a857c5c51b7efdc950a6ecf930b6ee Mon Sep 17 00:00:00 2001
-From: "ross.kirsling@sony.com"
- <ross.kirsling@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Fri, 4 Oct 2019 20:25:56 +0000
-Subject: [PATCH] Unreviewed WinCairo build fix for r250717.
-
-* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
-(WebKit::LayerTreeHost::invalidate): Deleted.
-
-
-
-git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250743 268f45cc-cd09-0410-ab3c-d52691b4dbfc
----
- .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletion(-)
-
-diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-index 980513647ff..d214532d852 100644
---- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-+++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -212,7 +212,6 @@ inline void LayerTreeHost::scheduleLayerFlush() { }
- inline void LayerTreeHost::cancelPendingLayerFlush() { }
- inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { }
- inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { }
--inline void LayerTreeHost::invalidate() { }
- inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { }
- inline void LayerTreeHost::forceRepaint() { }
- inline bool LayerTreeHost::forceRepaintAsync(CallbackID) { return false; }
--- 
-2.20.1
-
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
new file mode 100644
index 00000000..85328be1
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-gtk-doc.patch
@@ -0,0 +1,27 @@
+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.26.3-fix-noGL-wayland-build.patch b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
new file mode 100644
index 00000000..4549f171
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.3-fix-noGL-wayland-build.patch
@@ -0,0 +1,39 @@
+From 874dceeafc08edc979093509dff3ee6a8b25c432 Mon Sep 17 00:00:00 2001
+From: "commit-queue@webkit.org"
+ <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Thu, 19 Sep 2019 02:34:49 +0000
+Subject: [PATCH] [GTK] Compilation errors when GL is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=200223
+
+Fix following compilation error when building with ENABLE_OPENGL=OFF
+../../Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp:123:51: error: use of undeclared identifier 'WaylandCompositor'
+parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
+                                          ^
+Patch by Yury Semikhatsky <yurys@chromium.org> on 2019-09-18
+Reviewed by Philippe Normand.
+
+* UIProcess/glib/WebProcessPoolGLib.cpp:
+(WebKit::WebProcessPool::platformInitializeWebProcess): only make a call when using EGL, this matches
+guards in WaylandCompositor.h. The condition was changed in r245807.
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250077 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+index 37ece2f4576..a380a25fa4b 100644
+--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
+@@ -119,7 +119,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
+             parameters.hostClientFileDescriptor = wpe_renderer_host_create_client();
+             parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name());
+         }
+-#else
++#elif USE(EGL)
+         parameters.waylandCompositorDisplayName = WaylandCompositor::singleton().displayName();
+ #endif
+     }
+-- 
+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 475c9851..00000000
--- 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