| 1 |
commit: 318a792bdc040f949e14bcfe80f72bd5935f66ac |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 28 20:16:25 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 1 08:02:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318a792b |
| 7 |
|
| 8 |
kde5-functions.eclass: Fix minimum version requirements |
| 9 |
|
| 10 |
- Plasma 5.8 stable branch should not require Qt-5.7.1 |
| 11 |
- Plasma 5.10 already requires KF-5.34 |
| 12 |
|
| 13 |
eclass/kde5-functions.eclass | 7 +++++-- |
| 14 |
1 file changed, 5 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
| 17 |
index ba4abbd4490..574716299ec 100644 |
| 18 |
--- a/eclass/kde5-functions.eclass |
| 19 |
+++ b/eclass/kde5-functions.eclass |
| 20 |
@@ -35,10 +35,13 @@ case ${CATEGORY} in |
| 21 |
[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} |
| 22 |
;; |
| 23 |
kde-plasma) |
| 24 |
- if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then |
| 25 |
+ if [[ $(get_version_component_range 2) -ge 9 ]]; then |
| 26 |
: ${QT_MINIMAL:=5.7.1} |
| 27 |
fi |
| 28 |
- if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 29 |
+ if ! [[ $(get_version_component_range 2) -le 9 && $(get_version_component_range 3) -lt 50 ]]; then |
| 30 |
+ : ${FRAMEWORKS_MINIMAL:=5.34.0} |
| 31 |
+ fi |
| 32 |
+ if [[ ${KDE_BUILD_TYPE} = live && $(get_version_component_range 2) -ne 8 ]]; then |
| 33 |
: ${FRAMEWORKS_MINIMAL:=9999} |
| 34 |
: ${QT_MINIMAL:=5.7.1} |
| 35 |
fi |
Archives