| 1 |
commit: bcf3a57c93a537af5ead3fb255b2079c5392d803 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 31 22:24:03 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 31 22:24:03 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bcf3a57c |
| 7 |
|
| 8 |
[eclass] Require live frameworks for build type live, bug #538260 |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/kde5-functions.eclass | 5 ----- |
| 12 |
eclass/kde5.eclass | 1 + |
| 13 |
2 files changed, 1 insertion(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
| 16 |
index b50d9a4..21e92fd 100644 |
| 17 |
--- a/eclass/kde5-functions.eclass |
| 18 |
+++ b/eclass/kde5-functions.eclass |
| 19 |
@@ -124,11 +124,6 @@ add_frameworks_dep() { |
| 20 |
version=${3} |
| 21 |
elif [[ ${CATEGORY} = kde-frameworks ]]; then |
| 22 |
version=$(get_version_component_range 1-2) |
| 23 |
- elif [[ ${CATEGORY} = kde-base ]]; then |
| 24 |
- case $(get_kde_version) in |
| 25 |
- 5.1) version=5.3.0 ;; |
| 26 |
- *) version=${FRAMEWORKS_MINIMAL} ;; |
| 27 |
- esac |
| 28 |
elif [[ -z "${version}" ]] ; then |
| 29 |
version=${FRAMEWORKS_MINIMAL} |
| 30 |
fi |
| 31 |
|
| 32 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 33 |
index e971580..489080a 100644 |
| 34 |
--- a/eclass/kde5.eclass |
| 35 |
+++ b/eclass/kde5.eclass |
| 36 |
@@ -109,6 +109,7 @@ case ${KDE_AUTODEPS} in |
| 37 |
*) |
| 38 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 39 |
ecm_version=9999 |
| 40 |
+ FRAMEWORKS_MINIMAL=9999 |
| 41 |
elif [[ ${CATEGORY} = kde-frameworks ]]; then |
| 42 |
ecm_version=1.$(get_version_component_range 2).0 |
| 43 |
else |
Archives