| 1 |
commit: 6b2302effc4ef9997d3aef758248f1f4b64dc69b |
| 2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 12 15:51:55 2020 +0000 |
| 4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 12 15:52:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b2302ef |
| 7 |
|
| 8 |
net-libs/webkit-gtk-2.28: fix USE="-jumbo-build -gstreamer" build |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
| 12 |
|
| 13 |
.../webkit-gtk/files/2.28.2-non-jumbo-fix.patch | 34 ++++++++++++++++++++++ |
| 14 |
net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild | 1 + |
| 15 |
2 files changed, 35 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..da9f1d3f56a |
| 20 |
--- /dev/null |
| 21 |
+++ b/net-libs/webkit-gtk/files/2.28.2-non-jumbo-fix.patch |
| 22 |
@@ -0,0 +1,34 @@ |
| 23 |
+From d553de92ed238278f51b93a2c90af7d3ff7a2da2 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Mart Raudsepp <leio@g.o> |
| 25 |
+Date: Tue, 12 May 2020 15:28:45 +0300 |
| 26 |
+Subject: [PATCH] Try to fix an apparent non-unified build error |
| 27 |
+MIME-Version: 1.0 |
| 28 |
+Content-Type: text/plain; charset=UTF-8 |
| 29 |
+Content-Transfer-Encoding: 8bit |
| 30 |
+ |
| 31 |
+Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp: In member function ‘WTF::RefPtr<WebKit::InjectedBundleNodeHandle> |
| 32 |
+WebKit::InjectedBundleHitTestResult::urlElementHandle() const’: |
| 33 |
+Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:57:78: error: no matching function for call to |
| 34 |
+‘WebKit::InjectedBundleNodeHandle::getOrCreate(WebCore::Element*)’ |
| 35 |
+ 57 | return InjectedBundleNodeHandle::getOrCreate(m_hitTestResult.URLElement()); |
| 36 |
+ | ^ |
| 37 |
+In file included from Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp:29 |
| 38 |
+--- |
| 39 |
+ .../WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp | 1 + |
| 40 |
+ 1 file changed, 1 insertion(+) |
| 41 |
+ |
| 42 |
+diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp |
| 43 |
+index df8e55df1f0..26f045bd3fc 100644 |
| 44 |
+--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp |
| 45 |
++++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp |
| 46 |
+@@ -32,6 +32,7 @@ |
| 47 |
+ #include "WebImage.h" |
| 48 |
+ #include <WebCore/BitmapImage.h> |
| 49 |
+ #include <WebCore/Document.h> |
| 50 |
++#include <WebCore/Element.h> |
| 51 |
+ #include <WebCore/Frame.h> |
| 52 |
+ #include <WebCore/FrameLoader.h> |
| 53 |
+ #include <WebCore/FrameView.h> |
| 54 |
+-- |
| 55 |
+2.20.1 |
| 56 |
+ |
| 57 |
|
| 58 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild |
| 59 |
index 506b161ddf4..ec2540acbd1 100644 |
| 60 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild |
| 61 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.28.2.ebuild |
| 62 |
@@ -172,6 +172,7 @@ src_prepare() { |
| 63 |
eapply "${FILESDIR}"/${PV}-use-gst-audiointerleave.patch |
| 64 |
eapply "${FILESDIR}"/${PV}-fix-ppc64-JSC.patch |
| 65 |
eapply "${FILESDIR}"/${PV}-opengl-without-X-fixes.patch |
| 66 |
+ eapply "${FILESDIR}"/${PV}-non-jumbo-fix.patch |
| 67 |
cmake-utils_src_prepare |
| 68 |
gnome2_src_prepare |
| 69 |
} |
Archives