| 1 |
commit: dde63a0857af89546bbd63a6603c9e7ce206d76a |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 14 16:38:28 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 14 16:38:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=dde63a08 |
| 7 |
|
| 8 |
kde5.eclass: KDE_DESIGNERPLUGIN min KF5 is set by kde5-functions.eclass |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/kde5.eclass | 29 ++++++++++++++--------------- |
| 13 |
1 file changed, 14 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 16 |
index 3ab9220914..21ed9d2134 100644 |
| 17 |
--- a/eclass/kde5.eclass |
| 18 |
+++ b/eclass/kde5.eclass |
| 19 |
@@ -177,6 +177,20 @@ case ${KDE_SUBSLOT} in |
| 20 |
;; |
| 21 |
esac |
| 22 |
|
| 23 |
+case ${KDE_AUTODEPS} in |
| 24 |
+ false) ;; |
| 25 |
+ *) |
| 26 |
+ BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)" |
| 27 |
+ RDEPEND+=" >=kde-frameworks/kf-env-4" |
| 28 |
+ COMMONDEPEND+=" $(add_qt_dep qtcore)" |
| 29 |
+ |
| 30 |
+ # all packages need breeze/oxygen icons for basic iconset, bug #564838 |
| 31 |
+ if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then |
| 32 |
+ RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )" |
| 33 |
+ fi |
| 34 |
+ ;; |
| 35 |
+esac |
| 36 |
+ |
| 37 |
case ${KDE_DESIGNERPLUGIN} in |
| 38 |
false) ;; |
| 39 |
*) |
| 40 |
@@ -185,7 +199,6 @@ case ${KDE_DESIGNERPLUGIN} in |
| 41 |
BDEPEND+=" designer? ( $(add_qt_dep designer) )" |
| 42 |
else |
| 43 |
if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 19.08* ]]; then |
| 44 |
- FRAMEWORKS_MINIMAL="5.62.0" |
| 45 |
BDEPEND+=" designer? ( $(add_qt_dep designer) )" |
| 46 |
else |
| 47 |
BDEPEND+=" designer? ( $(add_frameworks_dep kdesignerplugin) )" |
| 48 |
@@ -193,20 +206,6 @@ case ${KDE_DESIGNERPLUGIN} in |
| 49 |
fi |
| 50 |
esac |
| 51 |
|
| 52 |
-case ${KDE_AUTODEPS} in |
| 53 |
- false) ;; |
| 54 |
- *) |
| 55 |
- BDEPEND+=" $(add_frameworks_dep extra-cmake-modules)" |
| 56 |
- RDEPEND+=" >=kde-frameworks/kf-env-4" |
| 57 |
- COMMONDEPEND+=" $(add_qt_dep qtcore)" |
| 58 |
- |
| 59 |
- # all packages need breeze/oxygen icons for basic iconset, bug #564838 |
| 60 |
- if [[ ${PN} != breeze-icons && ${PN} != oxygen-icons ]]; then |
| 61 |
- RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )" |
| 62 |
- fi |
| 63 |
- ;; |
| 64 |
-esac |
| 65 |
- |
| 66 |
case ${KDE_DEBUG} in |
| 67 |
false) ;; |
| 68 |
*) |
Archives