From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD4EE1382C5 for ; Wed, 9 May 2018 20:17:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1457E0AC1; Wed, 9 May 2018 20:17:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 95173E0AC1 for ; Wed, 9 May 2018 20:17:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB9EC335C7C for ; Wed, 9 May 2018 20:17:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 55DBC42 for ; Wed, 9 May 2018 20:17:43 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1525897031.8fafb3271bb1a83928e492a18f8a2a037b56dc44.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8fafb3271bb1a83928e492a18f8a2a037b56dc44 X-VCS-Branch: master Date: Wed, 9 May 2018 20:17:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 766614b8-c99f-4c04-bf23-155782eb06ec X-Archives-Hash: 1ca106aa43850269d576989cfbf9260d commit: 8fafb3271bb1a83928e492a18f8a2a037b56dc44 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed May 9 20:17:11 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed May 9 20:17:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fafb327 dev-qt/qtwebengine: Fix build without dev-qt/qtlocation Thanks-to: Jimi Huotari gentoo.org> Tested-by: josef64 (via irc #gentoo-qt) Package-Manager: Portage-2.3.36, Repoman-2.3.9 ...webengine-5.11.0-fix-build-w-o-qtlocation.patch | 56 ++++++++++++++++++++++ dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild | 2 + 2 files changed, 58 insertions(+) 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 new file mode 100644 index 00000000000..2c5012ee34b --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch @@ -0,0 +1,56 @@ +From 383ee1aa19b7b72c686d70f34bc9c377a51aaf5e Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Wed, 9 May 2018 13:23:17 +0200 +Subject: [PATCH] Fix build without qtlocation + +Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a +--- + src/core/content_browser_client_qt.cpp | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp +index 30ec43ca0..3878bd1bf 100644 +--- a/src/core/content_browser_client_qt.cpp ++++ b/src/core/content_browser_client_qt.cpp +@@ -68,6 +68,7 @@ + #include "content/public/common/main_function_params.h" + #include "content/public/common/service_names.mojom.h" + #include "content/public/common/url_constants.h" ++#include "device/geolocation/public/cpp/location_provider.h" + #include "mojo/public/cpp/bindings/binding.h" + #include "mojo/public/cpp/bindings/binding_set.h" + #include "printing/features/features.h" +@@ -93,7 +94,6 @@ + #include "certificate_error_controller_p.h" + #include "desktop_screen_qt.h" + #include "devtools_manager_delegate_qt.h" +-#include "location_provider_qt.h" + #include "media_capture_devices_dispatcher.h" + #include "net/network_delegate_qt.h" + #include "net/qrc_protocol_handler_qt.h" +@@ -123,6 +123,10 @@ + #include "renderer_host/pepper/pepper_host_factory_qt.h" + #endif + ++#if defined(QT_USE_POSITIONING) ++#include "location_provider_qt.h" ++#endif ++ + #include + #include + #ifndef QT_NO_OPENGL +@@ -737,7 +741,11 @@ bool ContentBrowserClientQt::CanCreateWindow( + + std::unique_ptr ContentBrowserClientQt::OverrideSystemLocationProvider() + { ++#if defined(QT_USE_POSITIONING) + return base::WrapUnique(new LocationProviderQt()); ++#else ++ return nullptr; ++#endif + } + + scoped_refptr GetSystemRequestContextOnUIThread() +-- +2.16.3 + diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild index 32064b192b0..735be56a730 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild @@ -77,6 +77,8 @@ DEPEND="${RDEPEND} pax_kernel? ( sys-apps/elfix ) " +PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" ) + src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) use system-icu && has_version ">=dev-libs/icu-59" && \