diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41496 -> 41506 bytes | |||
| -rw-r--r-- | eclass/kde5-functions.eclass | 9 | ||||
| -rw-r--r-- | eclass/kde5.eclass | 13 |
3 files changed, 15 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 15358835221c..04db371db994 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 36d61f8fc503..d60d9d55101e 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -37,11 +37,16 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - [[ ${PV} = 5.11* ]] && : ${FRAMEWORKS_MINIMAL:=5.38.0} 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 @@ -52,7 +57,7 @@ esac # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL # @DESCRIPTION: # Minimum version of Frameworks to require. This affects add_frameworks_dep. -: ${FRAMEWORKS_MINIMAL:=5.37.0} +: ${FRAMEWORKS_MINIMAL:=5.40.0} # @ECLASS-VARIABLE: PLASMA_MINIMAL # @DESCRIPTION: 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 |