|
 |
38cd3fe |
diff -rupN clementine-0.4.2.old/CMakeLists.txt clementine-0.4.2/CMakeLists.txt
|
|
|
38cd3fe |
--- clementine-0.4.2.old/CMakeLists.txt 2010-07-16 22:42:41.000000000 -0400
|
|
|
38cd3fe |
+++ clementine-0.4.2/CMakeLists.txt 2010-07-16 22:46:52.000000000 -0400
|
|
|
38cd3fe |
@@ -169,8 +169,17 @@ else(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
|
38cd3fe |
set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication)
|
|
|
38cd3fe |
endif(USE_SYSTEM_QTSINGLEAPPLICATION)
|
|
|
38cd3fe |
|
|
|
38cd3fe |
+# QtIoCompressor isn't patched, so we can use a system version if it's
|
|
|
38cd3fe |
+# available
|
|
|
38cd3fe |
+find_path(QTIOCOMPRESSOR_INCLUDE_DIRS qtiocompressor.h PATH_SUFFIXES QtSolutions)
|
|
|
38cd3fe |
+find_library(QTIOCOMPRESSOR_LIBRARIES QtSolutions_IOCompressor-2.3)
|
|
|
38cd3fe |
+if(NOT QTIOCOMPRESSOR_INCLUDE_DIRS OR NOT QTIOCOMPRESSOR_LIBRARIES)
|
|
|
38cd3fe |
+ add_subdirectory(3rdparty/qtiocompressor)
|
|
|
38cd3fe |
+ set(QTIOCOMPRESSOR_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtiocompressor)
|
|
|
38cd3fe |
+ set(QTIOCOMPRESSOR_LIBRARIES qtiocompressor)
|
|
|
38cd3fe |
+endif(NOT QTIOCOMPRESSOR_INCLUDE_DIRS OR NOT QTIOCOMPRESSOR_LIBRARIES)
|
|
|
38cd3fe |
+
|
|
|
38cd3fe |
# Subdirectories
|
|
|
38cd3fe |
-add_subdirectory(3rdparty/qtiocompressor)
|
|
|
38cd3fe |
add_subdirectory(src)
|
|
|
38cd3fe |
if (NOT APPLE)
|
|
|
38cd3fe |
add_subdirectory(3rdparty/qxt)
|
|
|
38cd3fe |
diff -rupN clementine-0.4.2.old/src/CMakeLists.txt clementine-0.4.2/src/CMakeLists.txt
|
|
|
38cd3fe |
--- clementine-0.4.2.old/src/CMakeLists.txt 2010-07-16 22:43:28.000000000 -0400
|
|
|
38cd3fe |
+++ clementine-0.4.2/src/CMakeLists.txt 2010-07-16 22:47:48.000000000 -0400
|
|
|
38cd3fe |
@@ -6,7 +6,6 @@ set(CMAKE_CXX_FLAGS "-Woverloaded-virtua
|
|
|
38cd3fe |
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
|
|
38cd3fe |
include_directories(${SPARKLE})
|
|
|
38cd3fe |
include_directories(../3rdparty/gmock/gtest/include)
|
|
|
38cd3fe |
-include_directories(../3rdparty/qtiocompressor)
|
|
|
38cd3fe |
include_directories(../3rdparty/qxt)
|
|
|
38cd3fe |
|
|
|
38cd3fe |
include_directories(${GLIB_INCLUDE_DIRS})
|
|
|
38cd3fe |
@@ -14,6 +13,7 @@ include_directories(${LIBXML_INCLUDE_DIR
|
|
|
38cd3fe |
include_directories(${GOBJECT_INCLUDE_DIRS})
|
|
|
38cd3fe |
include_directories(${LIBPROJECTM_INCLUDE_DIRS})
|
|
|
38cd3fe |
include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
|
|
|
38cd3fe |
+include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS})
|
|
|
38cd3fe |
|
|
|
38cd3fe |
cmake_policy(SET CMP0011 NEW)
|
|
|
38cd3fe |
include(../cmake/AddEngine.cmake)
|
|
|
38cd3fe |
@@ -449,7 +449,6 @@ add_library(clementine_lib STATIC
|
|
|
38cd3fe |
add_dependencies(clementine_lib pot)
|
|
|
38cd3fe |
|
|
|
38cd3fe |
target_link_libraries(clementine_lib
|
|
|
38cd3fe |
- qtiocompressor
|
|
|
38cd3fe |
chardet
|
|
|
38cd3fe |
${GOBJECT_LIBRARIES}
|
|
|
38cd3fe |
${GLIB_LIBRARIES}
|
|
|
38cd3fe |
@@ -458,6 +457,7 @@ target_link_libraries(clementine_lib
|
|
|
38cd3fe |
${ENGINE_LIBRARIES}
|
|
|
38cd3fe |
${LASTFM_LIBRARIES}
|
|
|
38cd3fe |
${QTSINGLEAPPLICATION_LIBRARIES}
|
|
|
38cd3fe |
+ ${QTIOCOMPRESSOR_LIBRARIES}
|
|
|
38cd3fe |
)
|
|
|
38cd3fe |
|
|
|
38cd3fe |
if(ENABLE_VISUALISATIONS)
|
|
|
38cd3fe |
diff -rupN clementine-0.4.2.old/src/radio/magnatuneservice.cpp clementine-0.4.2/src/radio/magnatuneservice.cpp
|
|
|
38cd3fe |
--- clementine-0.4.2.old/src/radio/magnatuneservice.cpp 2010-07-01 14:16:36.000000000 -0400
|
|
|
38cd3fe |
+++ clementine-0.4.2/src/radio/magnatuneservice.cpp 2010-07-16 22:49:14.000000000 -0400
|
|
|
38cd3fe |
@@ -28,11 +28,12 @@
|
|
|
38cd3fe |
#include "ui/iconloader.h"
|
|
|
38cd3fe |
#include "ui/settingsdialog.h"
|
|
|
38cd3fe |
|
|
|
38cd3fe |
+#include "qtiocompressor.h"
|
|
|
38cd3fe |
+
|
|
|
38cd3fe |
#include <QNetworkAccessManager>
|
|
|
38cd3fe |
#include <QNetworkRequest>
|
|
|
38cd3fe |
#include <QNetworkReply>
|
|
|
38cd3fe |
#include <QXmlStreamReader>
|
|
|
38cd3fe |
-#include <QtIOCompressor>
|
|
|
38cd3fe |
#include <QSortFilterProxyModel>
|
|
|
38cd3fe |
#include <QMenu>
|
|
|
38cd3fe |
#include <QDesktopServices>
|