| 1 |
commit: 4d87fa70cd168a98c523932d9d8c43b8cf74d319 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 18 18:34:38 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 18 18:35:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d87fa70 |
| 7 |
|
| 8 |
media-gfx/digikam: Drop IUSE=webkit |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.3, Repoman-3.0.0 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/digikam/digikam-9999.ebuild | 7 +++---- |
| 14 |
media-gfx/digikam/metadata.xml | 1 - |
| 15 |
2 files changed, 3 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild |
| 18 |
index f96bf0ae40..d630d405fe 100644 |
| 19 |
--- a/media-gfx/digikam/digikam-9999.ebuild |
| 20 |
+++ b/media-gfx/digikam/digikam-9999.ebuild |
| 21 |
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.digikam.org/" |
| 22 |
|
| 23 |
LICENSE="GPL-2" |
| 24 |
SLOT="5" |
| 25 |
-IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X" |
| 26 |
+IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop X" |
| 27 |
|
| 28 |
BDEPEND=" |
| 29 |
>=dev-util/cmake-3.14.3 |
| 30 |
@@ -42,6 +42,7 @@ COMMON_DEPEND=" |
| 31 |
>=dev-qt/qtnetwork-${QTMIN}:5 |
| 32 |
>=dev-qt/qtprintsupport-${QTMIN}:5 |
| 33 |
>=dev-qt/qtsql-${QTMIN}:5[mysql?] |
| 34 |
+ >=dev-qt/qtwebengine-${QTMIN}:5[widgets] |
| 35 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
| 36 |
>=dev-qt/qtxml-${QTMIN}:5 |
| 37 |
>=dev-qt/qtxmlpatterns-${QTMIN}:5 |
| 38 |
@@ -90,8 +91,6 @@ COMMON_DEPEND=" |
| 39 |
panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) |
| 40 |
scanner? ( >=kde-apps/libksane-19.04.3:5 ) |
| 41 |
semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) |
| 42 |
- !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) |
| 43 |
- webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) |
| 44 |
X? ( |
| 45 |
>=dev-qt/qtx11extras-${QTMIN}:5 |
| 46 |
x11-libs/libX11 |
| 47 |
@@ -125,6 +124,7 @@ src_configure() { |
| 48 |
-DBUILD_TESTING=OFF # bug 698192 |
| 49 |
-DENABLE_APPSTYLES=ON |
| 50 |
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON |
| 51 |
+ -DENABLE_QWEBENGINE=ON |
| 52 |
-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) |
| 53 |
$(cmake_use_find_package calendar KF5CalendarCore) |
| 54 |
$(cmake_use_find_package gphoto2 Gphoto2) |
| 55 |
@@ -140,7 +140,6 @@ src_configure() { |
| 56 |
$(cmake_use_find_package panorama KF5ThreadWeaver) |
| 57 |
$(cmake_use_find_package scanner KF5Sane) |
| 58 |
$(cmake_use_find_package semantic-desktop KF5FileMetaData) |
| 59 |
- -DENABLE_QWEBENGINE=$(usex !webkit) |
| 60 |
$(cmake_use_find_package X X11) |
| 61 |
) |
| 62 |
|
| 63 |
|
| 64 |
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml |
| 65 |
index f08d859d16..518cc8835a 100644 |
| 66 |
--- a/media-gfx/digikam/metadata.xml |
| 67 |
+++ b/media-gfx/digikam/metadata.xml |
| 68 |
@@ -17,6 +17,5 @@ |
| 69 |
<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag> |
| 70 |
<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag> |
| 71 |
<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag> |
| 72 |
- <flag name="webkit">Build with <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg></flag> |
| 73 |
</use> |
| 74 |
</pkgmetadata> |
Archives