| 1 |
commit: 333496a37c2c53ebcef2b8284bab47d0dedd5fbc |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 5 12:22:08 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 5 12:22:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=333496a3 |
| 7 |
|
| 8 |
kde-apps/konqueror: Drop USE webengine from stable branch |
| 9 |
|
| 10 |
Drop a hack to disable QtWebEngine dependency. On master it is already gone, |
| 11 |
QtWebKit is deprecated anyway, kwebkitpart is practically unmaintained. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 15 |
|
| 16 |
kde-apps/konqueror/konqueror-19.12.49.9999.ebuild | 24 ++++++++--------------- |
| 17 |
kde-apps/konqueror/metadata.xml | 1 - |
| 18 |
2 files changed, 8 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild b/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild |
| 21 |
index 7501ed4f81..41c2577e7d 100644 |
| 22 |
--- a/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild |
| 23 |
+++ b/kde-apps/konqueror/konqueror-19.12.49.9999.ebuild |
| 24 |
@@ -5,9 +5,7 @@ EAPI=7 |
| 25 |
|
| 26 |
ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support |
| 27 |
ECM_TEST="true" |
| 28 |
-PVCUT=$(ver_cut 1-3) |
| 29 |
KFMIN=5.63.0 |
| 30 |
-PLASMA_MINIMAL=5.16.5 |
| 31 |
QTMIN=5.12.3 |
| 32 |
VIRTUALX_REQUIRED="test" |
| 33 |
inherit flag-o-matic ecm kde.org |
| 34 |
@@ -18,12 +16,17 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror" |
| 35 |
LICENSE="GPL-2" # TODO: CHECK |
| 36 |
SLOT="5" |
| 37 |
KEYWORDS="" |
| 38 |
-IUSE="activities speech tidy +webengine X" |
| 39 |
+IUSE="activities speech tidy X" |
| 40 |
|
| 41 |
# 4 of 4 tests fail. Last checked for 4.0.3 |
| 42 |
RESTRICT+=" test" |
| 43 |
|
| 44 |
COMMON_DEPEND=" |
| 45 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
| 46 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
| 47 |
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets] |
| 48 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
| 49 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
| 50 |
>=kde-frameworks/karchive-${KFMIN}:5 |
| 51 |
>=kde-frameworks/kbookmarks-${KFMIN}:5 |
| 52 |
>=kde-frameworks/kcmutils-${KFMIN}:5 |
| 53 |
@@ -49,33 +52,22 @@ COMMON_DEPEND=" |
| 54 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 55 |
>=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 56 |
>=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 57 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
| 58 |
- >=dev-qt/qtgui-${QTMIN}:5 |
| 59 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
| 60 |
- >=dev-qt/qtxml-${QTMIN}:5 |
| 61 |
sys-libs/zlib |
| 62 |
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) |
| 63 |
tidy? ( app-text/tidy-html5 ) |
| 64 |
- webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) |
| 65 |
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) |
| 66 |
" |
| 67 |
DEPEND="${COMMON_DEPEND} |
| 68 |
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) |
| 69 |
" |
| 70 |
RDEPEND="${COMMON_DEPEND} |
| 71 |
- >=kde-apps/kfind-${PVCUT}:5 |
| 72 |
- >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5 |
| 73 |
- !webengine? ( kde-misc/kwebkitpart:5 ) |
| 74 |
+ kde-apps/kfind:5 |
| 75 |
+ kde-plasma/kde-cli-tools:5 |
| 76 |
" |
| 77 |
|
| 78 |
src_prepare() { |
| 79 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
| 80 |
|
| 81 |
- if ! use webengine; then |
| 82 |
- ecm_punt_bogus_dep Qt5 WebEngineWidgets |
| 83 |
- cmake_comment_add_subdirectory webenginepart |
| 84 |
- fi |
| 85 |
- |
| 86 |
ecm_src_prepare |
| 87 |
} |
| 88 |
|
| 89 |
|
| 90 |
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml |
| 91 |
index 462e8ca374..a198affb54 100644 |
| 92 |
--- a/kde-apps/konqueror/metadata.xml |
| 93 |
+++ b/kde-apps/konqueror/metadata.xml |
| 94 |
@@ -8,6 +8,5 @@ |
| 95 |
<use> |
| 96 |
<flag name="activities">Enable kactivities support</flag> |
| 97 |
<flag name="speech">Build text-to-speech plugin</flag> |
| 98 |
- <flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag> |
| 99 |
</use> |
| 100 |
</pkgmetadata> |
Archives