summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-04-25 17:48:05 +0200
committerJohannes Huber <johu@gentoo.org>2016-04-25 17:48:29 +0200
commit7ef33fac334b797ea96be7f17f003a045f82409e (patch)
treefc412fde618550c5b26c0dd89fa77f8232ee2c90 /app-admin/calamares
parentthirdpartymirrors: Add https://pypi.io/ for pypi (diff)
downloadgentoo-7ef33fac334b797ea96be7f17f003a045f82409e.tar.gz
gentoo-7ef33fac334b797ea96be7f17f003a045f82409e.tar.bz2
gentoo-7ef33fac334b797ea96be7f17f003a045f82409e.zip
app-admin/calamares: Use qtwebengine
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-admin/calamares')
-rw-r--r--app-admin/calamares/calamares-2.2.1.ebuild8
1 files changed, 6 insertions, 2 deletions
diff --git a/app-admin/calamares/calamares-2.2.1.ebuild b/app-admin/calamares/calamares-2.2.1.ebuild
index 221ae71d7c72..c2281347edc6 100644
--- a/app-admin/calamares/calamares-2.2.1.ebuild
+++ b/app-admin/calamares/calamares-2.2.1.ebuild
@@ -4,6 +4,7 @@
EAPI=6
+QT_MINIMAL="5.6.0"
PYTHON_COMPAT=( python{3_4,3_5} )
inherit kde5 python-r1
@@ -31,7 +32,7 @@ DEPEND="${PYTHON_DEPS}
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtsvg)
- $(add_qt_dep qtwebkit)
+ $(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
>=dev-cpp/yaml-cpp-0.5.1
>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
@@ -67,7 +68,10 @@ src_prepare() {
}
src_configure() {
- local mycmakeargs=( "-DWITH_PARTITIONMANAGER=1" )
+ local mycmakeargs=(
+ -DWEBVIEW_FORCE_WEBKIT=OFF
+ )
+
kde5_src_configure
sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop