From 318a792bdc040f949e14bcfe80f72bd5935f66ac Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 28 Apr 2017 22:16:25 +0200 Subject: [PATCH] kde5-functions.eclass: Fix minimum version requirements - Plasma 5.8 stable branch should not require Qt-5.7.1 - Plasma 5.10 already requires KF-5.34 --- eclass/kde5-functions.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index ba4abbd44905..574716299ecd 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -35,10 +35,13 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then + if [[ $(get_version_component_range 2) -ge 9 ]]; then : ${QT_MINIMAL:=5.7.1} fi - if [[ ${KDE_BUILD_TYPE} = live ]]; then + if ! [[ $(get_version_component_range 2) -le 9 && $(get_version_component_range 3) -lt 50 ]]; then + : ${FRAMEWORKS_MINIMAL:=5.34.0} + fi + if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 2) -ne 8 ]]; then : ${FRAMEWORKS_MINIMAL:=9999} : ${QT_MINIMAL:=5.7.1} fi -- 2.26.2