1 |
commit: 8fafb3271bb1a83928e492a18f8a2a037b56dc44 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 9 20:17:11 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 9 20:17:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fafb327 |
7 |
|
8 |
dev-qt/qtwebengine: Fix build without dev-qt/qtlocation |
9 |
|
10 |
Thanks-to: Jimi Huotari <chiitoo <AT> gentoo.org> |
11 |
Tested-by: josef64 (via irc #gentoo-qt) |
12 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
13 |
|
14 |
...webengine-5.11.0-fix-build-w-o-qtlocation.patch | 56 ++++++++++++++++++++++ |
15 |
dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild | 2 + |
16 |
2 files changed, 58 insertions(+) |
17 |
|
18 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..2c5012ee34b |
21 |
--- /dev/null |
22 |
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch |
23 |
@@ -0,0 +1,56 @@ |
24 |
+From 383ee1aa19b7b72c686d70f34bc9c377a51aaf5e Mon Sep 17 00:00:00 2001 |
25 |
+From: Allan Sandfeld Jensen <allan.jensen@××.io> |
26 |
+Date: Wed, 9 May 2018 13:23:17 +0200 |
27 |
+Subject: [PATCH] Fix build without qtlocation |
28 |
+ |
29 |
+Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a |
30 |
+--- |
31 |
+ src/core/content_browser_client_qt.cpp | 10 +++++++++- |
32 |
+ 1 file changed, 9 insertions(+), 1 deletion(-) |
33 |
+ |
34 |
+diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp |
35 |
+index 30ec43ca0..3878bd1bf 100644 |
36 |
+--- a/src/core/content_browser_client_qt.cpp |
37 |
++++ b/src/core/content_browser_client_qt.cpp |
38 |
+@@ -68,6 +68,7 @@ |
39 |
+ #include "content/public/common/main_function_params.h" |
40 |
+ #include "content/public/common/service_names.mojom.h" |
41 |
+ #include "content/public/common/url_constants.h" |
42 |
++#include "device/geolocation/public/cpp/location_provider.h" |
43 |
+ #include "mojo/public/cpp/bindings/binding.h" |
44 |
+ #include "mojo/public/cpp/bindings/binding_set.h" |
45 |
+ #include "printing/features/features.h" |
46 |
+@@ -93,7 +94,6 @@ |
47 |
+ #include "certificate_error_controller_p.h" |
48 |
+ #include "desktop_screen_qt.h" |
49 |
+ #include "devtools_manager_delegate_qt.h" |
50 |
+-#include "location_provider_qt.h" |
51 |
+ #include "media_capture_devices_dispatcher.h" |
52 |
+ #include "net/network_delegate_qt.h" |
53 |
+ #include "net/qrc_protocol_handler_qt.h" |
54 |
+@@ -123,6 +123,10 @@ |
55 |
+ #include "renderer_host/pepper/pepper_host_factory_qt.h" |
56 |
+ #endif |
57 |
+ |
58 |
++#if defined(QT_USE_POSITIONING) |
59 |
++#include "location_provider_qt.h" |
60 |
++#endif |
61 |
++ |
62 |
+ #include <QGuiApplication> |
63 |
+ #include <QLocale> |
64 |
+ #ifndef QT_NO_OPENGL |
65 |
+@@ -737,7 +741,11 @@ bool ContentBrowserClientQt::CanCreateWindow( |
66 |
+ |
67 |
+ std::unique_ptr<device::LocationProvider> ContentBrowserClientQt::OverrideSystemLocationProvider() |
68 |
+ { |
69 |
++#if defined(QT_USE_POSITIONING) |
70 |
+ return base::WrapUnique(new LocationProviderQt()); |
71 |
++#else |
72 |
++ return nullptr; |
73 |
++#endif |
74 |
+ } |
75 |
+ |
76 |
+ scoped_refptr<net::URLRequestContextGetter> GetSystemRequestContextOnUIThread() |
77 |
+-- |
78 |
+2.16.3 |
79 |
+ |
80 |
|
81 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild |
82 |
index 32064b192b0..735be56a730 100644 |
83 |
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild |
84 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild |
85 |
@@ -77,6 +77,8 @@ DEPEND="${RDEPEND} |
86 |
pax_kernel? ( sys-apps/elfix ) |
87 |
" |
88 |
|
89 |
+PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" ) |
90 |
+ |
91 |
src_prepare() { |
92 |
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) |
93 |
use system-icu && has_version ">=dev-libs/icu-59" && \ |