From 84ffc64fc920cf397f9b74649d4f364692350c86 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 14 Aug 2019 13:01:53 +0200 Subject: kde5.eclass: KDE_DESIGNERPLUGIN: Make use of ECM 5.62.0 for KDE PIM Recent git master KDE PIM repositories are making use of BUILD_DESIGNERPLUGIN and the ECM facilities available since >=5.62.0 instead of kdesignerplugin. Signed-off-by: Andreas Sturmlechner --- eclass/kde5.eclass | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 38c0d0f125..d6f70a9e9e 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -187,6 +187,22 @@ case ${KDE_SUBSLOT} in ;; esac +case ${KDE_DESIGNERPLUGIN} in + false) ;; + *) + IUSE+=" designer" + if [[ ${CATEGORY} = kde-frameworks ]]; then + BDEPEND+=" designer? ( $(add_qt_dep designer) )" + else + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]]; then + FRAMEWORKS_MINIMAL="5.62.0" + BDEPEND+=" designer? ( $(add_qt_dep designer) )" + else + BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" + fi + fi +esac + case ${KDE_AUTODEPS} in false) ;; *) @@ -208,17 +224,6 @@ case ${KDE_DEBUG} in ;; esac -case ${KDE_DESIGNERPLUGIN} in - false) ;; - *) - IUSE+=" designer" - if [[ ${CATEGORY} = kde-frameworks ]]; then - BDEPEND+=" designer? ( $(add_qt_dep designer) )" - else - BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" - fi -esac - case ${KDE_EXAMPLES} in false) ;; *) @@ -611,7 +616,11 @@ kde5_src_configure() { if [[ ${CATEGORY} = kde-frameworks ]]; then cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) ) else - cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) ) + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]] ; then + cmakeargs+=( -DBUILD_DESIGNERPLUGIN=$(usex designer) ) + else + cmakeargs+=( $(cmake-utils_use_find_package designer KF5DesignerPlugin) ) + fi fi fi -- cgit v1.2.3