From 3b46038685c4d319ca0c88b3519cde04d615dc2a Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 13 May 2021 00:56:06 +0200 Subject: webkitgtk: fix build without opengl in DISTRO_FEATURES Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- ...e-CompletionHandler-when-USE_OPENGL_OR_ES.patch | 37 ++++++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.32.0.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch (limited to 'meta') diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch new file mode 100644 index 0000000000..b5367022d8 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch @@ -0,0 +1,37 @@ +From 834f335bb3e63e0bf78eed0520df33d5c55e5e8a Mon Sep 17 00:00:00 2001 +From: "commit-queue@webkit.org" + +Date: Sat, 10 Apr 2021 22:02:50 +0000 +Subject: [PATCH] Properly use CompletionHandler when USE_OPENGL_OR_ES is set + to OFF https://bugs.webkit.org/show_bug.cgi?id=224149 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Patch by Charlène Wendling on 2021-04-10 +Reviewed by Fujii Hironori. + +* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h: +(WebKit::LayerTreeHost::forceRepaintAsync): + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@275802 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +Upstream-Status: Backport +Signed-off-by: Martin Jansa +--- + .../WebPage/CoordinatedGraphics/LayerTreeHost.h | 2 +- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +index 6727d16c8c0b..db65f813267d 100644 +--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h ++++ b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h +@@ -213,7 +213,7 @@ inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) { } + inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) { } + inline void LayerTreeHost::scrollNonCompositedContents(const WebCore::IntRect&) { } + inline void LayerTreeHost::forceRepaint() { } +-inline bool LayerTreeHost::forceRepaintAsync(CompletionHandler&) { return false; } ++inline void LayerTreeHost::forceRepaintAsync(CompletionHandler&&) { } + inline void LayerTreeHost::sizeDidChange(const WebCore::IntSize&) { } + inline void LayerTreeHost::pauseRendering() { } + inline void LayerTreeHost::resumeRendering() { } diff --git a/meta/recipes-sato/webkit/webkitgtk_2.32.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.32.0.bb index 8a07fadd9b..31a6c97a32 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.32.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.32.0.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://musl-lower-stack-usage.patch \ file://0001-MiniBrowser-Fix-reproduciblity.patch \ file://49a19c49c6de8af74e521f36cb43e6c1ec2e391c.patch \ + file://0001-Properly-use-CompletionHandler-when-USE_OPENGL_OR_ES.patch \ " SRC_URI[sha256sum] = "9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0" -- cgit 1.2.3-korg