summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2022-01-03 00:34:53 +0200
committerMart Raudsepp <leio@gentoo.org>2022-01-03 00:44:13 +0200
commit55e70521884cf6143a68a7ead6f65095887f9906 (patch)
tree74bfcd23172c2b5e08aba570e78b4b62e3791ce1 /net-libs
parentnet-libs/webkit-gtk: fix USE=-opengl build patch (diff)
downloadgentoo-55e70521884cf6143a68a7ead6f65095887f9906.tar.gz
gentoo-55e70521884cf6143a68a7ead6f65095887f9906.tar.bz2
gentoo-55e70521884cf6143a68a7ead6f65095887f9906.zip
net-libs/webkit-gtk: fix build with USE=-jumbo-build
Thanks-to: Matt Whitlock <gentoo@mattwhitlock.name> Closes: https://bugs.gentoo.org/820437 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch43
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild1
2 files changed, 44 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
new file mode 100644
index 000000000000..b26f4243cd76
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch
@@ -0,0 +1,43 @@
+From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001
+From: "don.olmstead@sony.com"
+ <don.olmstead@sony.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Sun, 3 Oct 2021 23:00:17 +0000
+Subject: [PATCH] Non-unified build fixes, early October 2021 edition
+ https://bugs.webkit.org/show_bug.cgi?id=231143
+
+Unreviewed non-unified build fixes.
+---
+leio: Trimmed to what's relevant to webkitgtk-2.34 branch
+
+ Source/WebCore/html/track/InbandTextTrack.cpp | 1 +
+ Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/Source/WebCore/html/track/InbandTextTrack.cpp b/Source/WebCore/html/track/InbandTextTrack.cpp
+index d45969fbfc77..ab5605100a94 100644
+--- a/Source/WebCore/html/track/InbandTextTrack.cpp
++++ b/Source/WebCore/html/track/InbandTextTrack.cpp
+@@ -32,6 +32,7 @@
+ #include "InbandGenericTextTrack.h"
+ #include "InbandTextTrackPrivate.h"
+ #include "InbandWebVTTTextTrack.h"
++#include "TextTrackClient.h"
+ #include <wtf/IsoMallocInlines.h>
+
+ namespace WebCore {
+diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
+index 7f1012aa2a24..4c7c23995276 100644
+--- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
++++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h
+@@ -44,6 +44,8 @@ class InjectedScriptManager;
+ namespace WebCore {
+
+ class CanvasRenderingContext;
++class Frame;
++
+ #if ENABLE(WEBGL)
+ class InspectorShaderProgram;
+ class WebGLProgram;
+--
+2.32.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
index ff06c0b8a9ef..1faf9e7222f8 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild
@@ -172,6 +172,7 @@ pkg_setup() {
src_prepare() {
eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch
+ eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch
cmake_src_prepare
gnome2_src_prepare
}