diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /net-libs/webkit-gtk/files | |
parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) |
gentoo resync : 05.02.2020
Diffstat (limited to 'net-libs/webkit-gtk/files')
3 files changed, 66 insertions, 31 deletions
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 422c71a452f2..000000000000 --- 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 000000000000..85328be1a5ca --- /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 000000000000..4549f1712e6c --- /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 + |