| 1 |
commit: 0d4a36892a12b23b1eed860793d26fee30bf36ef |
| 2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 4 23:49:55 2012 +0000 |
| 4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 4 23:49:55 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0d4a3689 |
| 7 |
|
| 8 |
[eclass] Upstream now effectively requires Qt 4.8 for KDE 4.9+ |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/kde4-base.eclass | 5 ++++- |
| 12 |
1 files changed, 4 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
| 15 |
index e85b375..e622f37 100644 |
| 16 |
--- a/eclass/kde4-base.eclass |
| 17 |
+++ b/eclass/kde4-base.eclass |
| 18 |
@@ -199,7 +199,10 @@ esac |
| 19 |
# @ECLASS-VARIABLE: QT_MINIMAL |
| 20 |
# @DESCRIPTION: |
| 21 |
# Determine version of qt we enforce as minimal for the package. |
| 22 |
-if version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then |
| 23 |
+if version_is_at_least 4.8.50 "${KDE_MINIMAL}"; then |
| 24 |
+ # Upstream has added an *undeclared* dependency on Qt 4.8... |
| 25 |
+ QT_MINIMAL="${QT_MINIMAL:-4.8.0}" |
| 26 |
+elif version_is_at_least 4.7.80 "${KDE_MINIMAL}"; then |
| 27 |
QT_MINIMAL="${QT_MINIMAL:-4.7.4}" |
| 28 |
else |
| 29 |
QT_MINIMAL="${QT_MINIMAL:-4.7.0}" |
Archives