1 |
commit: 55e70521884cf6143a68a7ead6f65095887f9906 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 2 22:34:53 2022 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 2 22:44:13 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e70521 |
7 |
|
8 |
net-libs/webkit-gtk: fix build with USE=-jumbo-build |
9 |
|
10 |
Thanks-to: Matt Whitlock <gentoo <AT> mattwhitlock.name> |
11 |
Closes: https://bugs.gentoo.org/820437 |
12 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
13 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
14 |
|
15 |
.../webkit-gtk/files/2.34.3-non-jumbo-fix.patch | 43 ++++++++++++++++++++++ |
16 |
net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild | 1 + |
17 |
2 files changed, 44 insertions(+) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 000000000000..b26f4243cd76 |
22 |
--- /dev/null |
23 |
+++ b/net-libs/webkit-gtk/files/2.34.3-non-jumbo-fix.patch |
24 |
@@ -0,0 +1,43 @@ |
25 |
+From f8efe9f2d128a897c0b2a054bf05200cb842d9b2 Mon Sep 17 00:00:00 2001 |
26 |
+From: "don.olmstead@××××.com" |
27 |
+ <don.olmstead@××××.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> |
28 |
+Date: Sun, 3 Oct 2021 23:00:17 +0000 |
29 |
+Subject: [PATCH] Non-unified build fixes, early October 2021 edition |
30 |
+ https://bugs.webkit.org/show_bug.cgi?id=231143 |
31 |
+ |
32 |
+Unreviewed non-unified build fixes. |
33 |
+--- |
34 |
+leio: Trimmed to what's relevant to webkitgtk-2.34 branch |
35 |
+ |
36 |
+ Source/WebCore/html/track/InbandTextTrack.cpp | 1 + |
37 |
+ Source/WebCore/inspector/agents/InspectorCanvasAgent.h | 2 ++ |
38 |
+ 2 files changed, 3 insertions(+) |
39 |
+ |
40 |
+diff --git a/Source/WebCore/html/track/InbandTextTrack.cpp b/Source/WebCore/html/track/InbandTextTrack.cpp |
41 |
+index d45969fbfc77..ab5605100a94 100644 |
42 |
+--- a/Source/WebCore/html/track/InbandTextTrack.cpp |
43 |
++++ b/Source/WebCore/html/track/InbandTextTrack.cpp |
44 |
+@@ -32,6 +32,7 @@ |
45 |
+ #include "InbandGenericTextTrack.h" |
46 |
+ #include "InbandTextTrackPrivate.h" |
47 |
+ #include "InbandWebVTTTextTrack.h" |
48 |
++#include "TextTrackClient.h" |
49 |
+ #include <wtf/IsoMallocInlines.h> |
50 |
+ |
51 |
+ namespace WebCore { |
52 |
+diff --git a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h |
53 |
+index 7f1012aa2a24..4c7c23995276 100644 |
54 |
+--- a/Source/WebCore/inspector/agents/InspectorCanvasAgent.h |
55 |
++++ b/Source/WebCore/inspector/agents/InspectorCanvasAgent.h |
56 |
+@@ -44,6 +44,8 @@ class InjectedScriptManager; |
57 |
+ namespace WebCore { |
58 |
+ |
59 |
+ class CanvasRenderingContext; |
60 |
++class Frame; |
61 |
++ |
62 |
+ #if ENABLE(WEBGL) |
63 |
+ class InspectorShaderProgram; |
64 |
+ class WebGLProgram; |
65 |
+-- |
66 |
+2.32.0 |
67 |
+ |
68 |
|
69 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild |
70 |
index ff06c0b8a9ef..1faf9e7222f8 100644 |
71 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild |
72 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.34.3.ebuild |
73 |
@@ -172,6 +172,7 @@ pkg_setup() { |
74 |
|
75 |
src_prepare() { |
76 |
eapply "${FILESDIR}"/2.34.3-opengl-without-X-fixes.patch |
77 |
+ eapply "${FILESDIR}"/2.34.3-non-jumbo-fix.patch |
78 |
cmake_src_prepare |
79 |
gnome2_src_prepare |
80 |
} |