diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-10 12:10:16 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-12-10 12:37:32 +0100 |
| commit | 8f496c9dd841a37af9b86192aaba54dbe7e252a2 (patch) | |
| tree | f0da6acd6430017906a5a6fe54da61207c5eeceb | |
| parent | kde5-functions.eclass: Raise FRAMEWORKS_MINIMAL to 5.40.0 (diff) | |
| download | gentoo-8f496c9dd841a37af9b86192aaba54dbe7e252a2.tar.gz gentoo-8f496c9dd841a37af9b86192aaba54dbe7e252a2.tar.bz2 gentoo-8f496c9dd841a37af9b86192aaba54dbe7e252a2.zip | |
kde5*.eclass: Add KDE Applications 17.12 support
| -rw-r--r-- | eclass/kde5-functions.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde5.eclass | 13 |
2 files changed, 14 insertions, 5 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 055b5188afb7..d60d9d55101e 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -38,9 +38,15 @@ case ${CATEGORY} in ;; kde-plasma) if [[ ${KDE_BUILD_TYPE} = live ]]; then + : ${QT_MINIMAL:=5.9.1} : ${FRAMEWORKS_MINIMAL:=9999} fi ;; + kde-apps) + if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then + : ${QT_MINIMAL:=5.9.1} + fi + ;; esac # @ECLASS-VARIABLE: QT_MINIMAL diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 51eeb57bad51..826e0abf10c9 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -228,10 +228,9 @@ case ${KDE_DESIGNERPLUGIN} in false) ;; *) IUSE+=" designer" - DEPEND+=" designer? ( - $(add_frameworks_dep kdesignerplugin) - $(add_qt_dep designer) - )" + DEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" + [[ ${PV} = 17.08* ]] && \ + DEPEND+=" designer? ( $(add_qt_dep designer) )" ;; esac @@ -636,7 +635,11 @@ kde5_src_configure() { fi if ! use_if_iuse designer && [[ ${KDE_DESIGNERPLUGIN} != false ]] ; then - cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) + if [[ ${PV} = 17.08* ]]; then + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON ) + else + cmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KF5DesignerPlugin=ON ) + fi fi if [[ ${KDE_QTHELP} != false ]]; then |