| 1 |
commit: a7f1ecabc48b0e804dea71df917cea23c6469c57 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 17 18:16:28 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 17 18:16:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7f1ecab |
| 7 |
|
| 8 |
kde-apps/marble: Drop USE webkit, add USE webengine |
| 9 |
|
| 10 |
Upstream commit b42ee5c83d77761ef7d8bf8635662159bc2884bb |
| 11 |
|
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 14 |
|
| 15 |
kde-apps/marble/marble-9999.ebuild | 10 +++++----- |
| 16 |
kde-apps/marble/metadata.xml | 1 + |
| 17 |
2 files changed, 6 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild |
| 20 |
index 2ec8a2e844..8f136a3b97 100644 |
| 21 |
--- a/kde-apps/marble/marble-9999.ebuild |
| 22 |
+++ b/kde-apps/marble/marble-9999.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Foundation |
| 25 |
+# Copyright 1999-2018 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" |
| 30 |
HOMEPAGE="https://marble.kde.org/" |
| 31 |
KEYWORDS="" |
| 32 |
|
| 33 |
-IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webkit" |
| 34 |
+IUSE="aprs +dbus designer gps +kde nls phonon +geolocation shapefile +webengine" |
| 35 |
|
| 36 |
# FIXME (new package): libwlocate, WLAN-based geolocation |
| 37 |
RDEPEND=" |
| 38 |
@@ -46,7 +46,7 @@ RDEPEND=" |
| 39 |
) |
| 40 |
phonon? ( media-libs/phonon[qt5(+)] ) |
| 41 |
shapefile? ( sci-libs/shapelib:= ) |
| 42 |
- webkit? ( $(add_qt_dep qtwebkit) ) |
| 43 |
+ webengine? ( $(add_qt_dep qtwebkit) ) |
| 44 |
" |
| 45 |
DEPEND="${RDEPEND} |
| 46 |
aprs? ( dev-lang/perl ) |
| 47 |
@@ -76,8 +76,8 @@ src_configure() { |
| 48 |
-DWITH_KF5=$(usex kde) |
| 49 |
-DWITH_Phonon4Qt5=$(usex phonon) |
| 50 |
-DWITH_libshp=$(usex shapefile) |
| 51 |
- $(cmake-utils_use_find_package webkit Qt5WebKit) |
| 52 |
- $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) |
| 53 |
+ $(cmake-utils_use_find_package webkit Qt5WebEngine) |
| 54 |
+ $(cmake-utils_use_find_package webkit Qt5WebEngineWidgets) |
| 55 |
-DWITH_libwlocate=OFF |
| 56 |
# bug 608890 |
| 57 |
-DKDE_INSTALL_CONFDIR="/etc/xdg" |
| 58 |
|
| 59 |
diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml |
| 60 |
index 88bdb56140..565eba0753 100644 |
| 61 |
--- a/kde-apps/marble/metadata.xml |
| 62 |
+++ b/kde-apps/marble/metadata.xml |
| 63 |
@@ -11,5 +11,6 @@ |
| 64 |
<flag name="geolocation">Enable position information via <pkg>dev-qt/qtpositioning</pkg></flag> |
| 65 |
<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag> |
| 66 |
<flag name="shapefile">Enable support for ESRI shapefiles</flag> |
| 67 |
+ <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag> |
| 68 |
</use> |
| 69 |
</pkgmetadata> |
Archives