Git commit 45bd2c938a43cc5715e09c9c2d98ec09ddd34b27 by Matěj Laitl. Committed on 13/12/2012 at 01:19. Pushed by laitl into branch 'master'.
Raise Qt dependency to >= 4.8; raise kdelibs dependency to >= 4.8.4 ...as agreed upon on amarok-devel ML [1], see the thread for reasons. [1] http://mail.kde.org/pipermail/amarok-devel/2012-November/011218.html DIGEST: Amarok now depends on Qt >= 4.8, kdelibs >= 4.8.4 CCMAIL: [email protected] M +5 -4 CMakeLists.txt M +1 -0 ChangeLog M +2 -2 README http://commits.kde.org/amarok/45bd2c938a43cc5715e09c9c2d98ec09ddd34b27 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e57ae5..5675000 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,16 +84,17 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/shared ${CMAKE_CURRENT_BINARY_DIR}/shared ) +set(QT_MIN_VERSION "4.8.0") if( WITH_PLAYER ) - set(KDE_MIN_VERSION "4.6.0") - find_package( KDE4 REQUIRED ) + set(KDE_MIN_VERSION "4.8.4") + find_package( KDE4 REQUIRED ) # honours QT_MIN_VERSION include (KDE4Defaults) include (MacroLibrary) include(MacroBoolTo01) include(MacroLogFeature) - macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org"; TRUE "4.6.0" "" ) + macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org"; TRUE ${KDE_MIN_VERSION} "" ) find_package( QtScriptQtBindings ) macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/"; FALSE "" "" ) @@ -237,7 +238,7 @@ if( WITH_PLAYER ) #DOC_SUBDIR else( WITH_PLAYER ) - find_package( Qt4 REQUIRED ) + find_package( Qt4 REQUIRED ) # honours QT_MIN_VERSION add_definitions(${QT_DEFINITIONS}) endif( WITH_PLAYER ) diff --git a/ChangeLog b/ChangeLog index a8faa25..3847d37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ VERSION 2.7-Beta 1 * Amazon store: We now ship a utility to handle downloads from Amazon. CHANGES: + * Dependencies raised, Amarok now depends on Qt >= 4.8 and kdelibs >= 4.8.4. * When configuring Last.fm plug-in, the changes are now applied immediately in most places. (BR 311331) * If liblastfm is provided, it is strongly recommended to use version 1.0.3 or newer diff --git a/README b/README index a028ac9..a43e5be 100644 --- a/README +++ b/README @@ -35,14 +35,14 @@ that really makes playlist handling easy. ============== Required - * KDE-Libs 4.6 + KDE-Base-runtime 4.6(oxygen-icons) (or newer) + * KDE-Libs 4.8.4 (or newer) + KDE-Base-runtime 4.8 (oxygen-icons) (or newer) http://www.kde.org * Phonon backend, one of the following is strongly recommended * phonon-vlc 0.6.1 (or newer) * phonon-gstreamer 4.6.2 (or newer) - * Qt 4.6 (or newer) + * Qt 4.8 (or newer) http://qt.nokia.com/ * TagLib 1.7 (or newer) _______________________________________________ Amarok-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/amarok-devel
