From acaa21bb0e78104a0f12c6345fe070654fef9f6b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 18 May 2019 21:24:56 +0200 Subject: [PATCH] kde5-functions.eclass: Set FRAMEWORKS_MINIMAL=5.57.0, cleanup versions Signed-off-by: Andreas Sturmlechner --- eclass/kde5-functions.eclass | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index a5c8039b5ba2..d2f85c077c0a 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -38,19 +38,10 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - [[ ${PV} = 5.14.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.52.0} - [[ ${PV} = 5.15.5 ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0} - if [[ ${PV} = 5.15.90 || ${PV} = 5.16* ]]; then - : ${FRAMEWORKS_MINIMAL:=5.58.0} - : ${QT_MINIMAL:=5.12.3} - fi - if [[ ${KDE_BUILD_TYPE} = live ]]; then - : ${FRAMEWORKS_MINIMAL:=9999} - : ${QT_MINIMAL:=5.12.3} - fi - ;; - kde-apps) - [[ ${PV} = 19.04* ]] && : ${FRAMEWORKS_MINIMAL:=5.57.0} + [[ ${PV} = 5.15.5 ]] && : ${QT_MINIMAL:=5.11.1} + [[ ${PV} = 5.16* ]] && : ${FRAMEWORKS_MINIMAL:=5.58.0} + [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} + : ${QT_MINIMAL:=5.12.3} ;; esac @@ -62,7 +53,7 @@ esac # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL # @DESCRIPTION: # Minimum version of Frameworks to require. This affects add_frameworks_dep. -: ${FRAMEWORKS_MINIMAL:=5.54.0} +: ${FRAMEWORKS_MINIMAL:=5.57.0} # @ECLASS-VARIABLE: PLASMA_MINIMAL # @DESCRIPTION: -- 2.26.2