From 3f759742fb3b15578d5f8e29b9e9c9cdc74840b4 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Dec 23 2010 19:29:48 +0000 Subject: - New upstream version --- diff --git a/.gitignore b/.gitignore index 1540219..a545fbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clementine-0.4.2.tar.gz /clementine-0.5.2.tar.gz /clementine-0.5.3.tar.gz +/clementine-0.6.tar.gz diff --git a/clementine-gst-safeguard.patch b/clementine-gst-safeguard.patch deleted file mode 100644 index 40946ce..0000000 --- a/clementine-gst-safeguard.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rupN clementine-0.5.2.old/src/engines/enginebase.cpp clementine-0.5.2/src/engines/enginebase.cpp ---- clementine-0.5.2.old/src/engines/enginebase.cpp 2010-06-14 15:15:10.000000000 -0400 -+++ clementine-0.5.2/src/engines/enginebase.cpp 2010-09-26 21:33:45.000000000 -0400 -@@ -78,3 +78,9 @@ void Engine::Base::EmitAboutToEnd() { - int Engine::Base::AddBackgroundStream(const QUrl& url) { - return -1; - } -+ -+bool Engine::Base::Play(const QUrl& u, TrackChangeType c) { -+ if (!Load(u, c)) -+ return false; -+ return Play(); -+} -diff -rupN clementine-0.5.2.old/src/engines/enginebase.h clementine-0.5.2/src/engines/enginebase.h ---- clementine-0.5.2.old/src/engines/enginebase.h 2010-08-28 14:48:16.000000000 -0400 -+++ clementine-0.5.2/src/engines/enginebase.h 2010-09-26 21:34:07.000000000 -0400 -@@ -61,7 +61,7 @@ class Base : public QObject, boost::nonc - - // Helpers - virtual bool Load(const QUrl &url, TrackChangeType change); -- bool Play(const QUrl &u, TrackChangeType c) { return Load(u, c) && Play(); } -+ bool Play(const QUrl &u, TrackChangeType c); - void SetVolume( uint value ); - - -diff -rupN clementine-0.5.2.old/src/engines/gstengine.cpp clementine-0.5.2/src/engines/gstengine.cpp ---- clementine-0.5.2.old/src/engines/gstengine.cpp 2010-08-28 15:22:58.000000000 -0400 -+++ clementine-0.5.2/src/engines/gstengine.cpp 2010-09-26 21:35:16.000000000 -0400 -@@ -496,6 +496,8 @@ void GstEngine::StartFadeout() { - bool GstEngine::Play( uint offset ) { - EnsureInitialised(); - -+ if (!current_pipeline_) -+ return false; - QFuture future = current_pipeline_->SetState(GST_STATE_PLAYING); - BoundFutureWatcher* watcher = - new BoundFutureWatcher(offset, this); diff --git a/clementine-no-qtwin.patch b/clementine-no-qtwin.patch deleted file mode 100644 index 985bcf0..0000000 --- a/clementine-no-qtwin.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -rupN clementine-0.5.1.old/CMakeLists.txt clementine-0.5.1/CMakeLists.txt ---- clementine-0.5.1.old/CMakeLists.txt 2010-09-11 17:12:46.000000000 -0400 -+++ clementine-0.5.1/CMakeLists.txt 2010-09-22 20:17:20.000000000 -0400 -@@ -202,7 +202,9 @@ endif (USE_SYSTEM_QXT) - - # Subdirectories - add_subdirectory(src) --add_subdirectory(3rdparty/qtwin) -+if (WIN32) -+ add_subdirectory(3rdparty/qtwin) -+endif (WIN32) - add_subdirectory(3rdparty/universalchardet) - add_subdirectory(tests) - add_subdirectory(dist) -diff -rupN clementine-0.5.1.old/src/CMakeLists.txt clementine-0.5.1/src/CMakeLists.txt ---- clementine-0.5.1.old/src/CMakeLists.txt 2010-09-11 17:12:46.000000000 -0400 -+++ clementine-0.5.1/src/CMakeLists.txt 2010-09-22 20:24:38.000000000 -0400 -@@ -6,7 +6,9 @@ set(CMAKE_CXX_FLAGS "-Woverloaded-virtua - include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) - include_directories(${SPARKLE}) - include_directories(../3rdparty/gmock/gtest/include) --include_directories(../3rdparty/qtwin) -+if(WIN32) -+ include_directories(../3rdparty/qtwin) -+endif(WIN32) - - include_directories(${GLIB_INCLUDE_DIRS}) - include_directories(${LIBXML_INCLUDE_DIRS}) -@@ -645,7 +647,6 @@ add_library(clementine_lib STATIC - add_dependencies(clementine_lib pot) - - target_link_libraries(clementine_lib -- qtwin - chardet - ${GOBJECT_LIBRARIES} - ${GLIB_LIBRARIES} -@@ -711,6 +712,7 @@ if (WIN32) - ${ZLIB_LIBRARIES} - ${MSWMDM_LIBRARIES} - ${SAC_SHIM_LIBRARIES} -+ qtwin - ) - endif (WIN32) - -diff -rupN clementine-0.5.1.old/src/widgets/osdpretty.cpp clementine-0.5.1/src/widgets/osdpretty.cpp ---- clementine-0.5.1.old/src/widgets/osdpretty.cpp 2010-07-07 19:03:35.000000000 -0400 -+++ clementine-0.5.1/src/widgets/osdpretty.cpp 2010-09-22 20:20:14.000000000 -0400 -@@ -17,7 +17,6 @@ - #include "osdpretty.h" - #include "ui_osdpretty.h" - --#include "qtwin.h" - - #include - #include -@@ -36,6 +35,10 @@ - # include - #endif - -+#ifdef Q_OS_WIN32 -+#include "qtwin.h" -+#endif -+ - const char* OSDPretty::kSettingsGroup = "OSDPretty"; - - const int OSDPretty::kDropShadowSize = 13; -@@ -297,8 +300,10 @@ void OSDPretty::Reposition() { - setMask(mask); - } - -+#ifdef Q_OS_WIN32 - // On windows, enable blurbehind on the masked area - QtWin::enableBlurBehindWindow(this, true, QRegion(mask)); -+#endif - } - - void OSDPretty::enterEvent(QEvent *) { diff --git a/clementine-no-ubuntu-icons.patch b/clementine-no-ubuntu-icons.patch new file mode 100644 index 0000000..bb93282 --- /dev/null +++ b/clementine-no-ubuntu-icons.patch @@ -0,0 +1,44 @@ +diff -rupN clementine-0.6.old/dist/CMakeLists.txt clementine-0.6/dist/CMakeLists.txt +--- clementine-0.6.old/dist/CMakeLists.txt 2010-10-24 09:16:44.000000000 -0400 ++++ clementine-0.6/dist/CMakeLists.txt 2010-12-23 13:51:03.000000000 -0500 +@@ -11,6 +11,19 @@ configure_file(${CMAKE_CURRENT_SOURCE_DI + ${CMAKE_CURRENT_SOURCE_DIR}/windows/clementine.nsi @ONLY) + # windows/windres.rc is done by src/CMakeLists.txt + ++if(EXISTS /etc/lsb-release) ++ file(READ "/etc/lsb-release" LSB_RELEASE_CONTENTS) ++ string(REGEX MATCH "DISTRIB_ID=Ubuntu" IS_UBUNTU ${LSB_RELEASE_CONTENTS}) ++ if(IS_UBUNTU) ++ set(INSTALL_UBUNTU_ICONS_DEFAULT ON) ++ else(IS_UBUNTU) ++ set(INSTALL_UBUNTU_ICONS_DEFAULT OFF) ++ endif(IS_UBUNTU) ++else(EXISTS /etc/lsb-release) ++ set(INSTALL_UBUNTU_ICONS_DEFAULT OFF) ++endif(EXISTS /etc/lsb-release) ++ ++option(INSTALL_UBUNTU_ICONS "Install the Ubuntu themed monochrome panel icons" ${INSTALL_UBUNTU_ICONS_DEFAULT}) + + if (NOT APPLE) + install(FILES clementine_64.png +@@ -27,11 +40,13 @@ if (NOT APPLE) + DESTINATION share/applications + ) + +- foreach(icon clementine-panel.png clementine-panel-grey.png) +- foreach(theme ubuntu-mono-dark ubuntu-mono-light) +- install(FILES icons/${theme}/${icon} +- DESTINATION share/icons/${theme}/apps/24/ +- ) +- endforeach(theme) +- endforeach(icon) ++ if(INSTALL_UBUNTU_ICONS) ++ foreach(icon clementine-panel.png clementine-panel-grey.png) ++ foreach(theme ubuntu-mono-dark ubuntu-mono-light) ++ install(FILES icons/${theme}/${icon} ++ DESTINATION share/icons/${theme}/apps/24/ ++ ) ++ endforeach(theme) ++ endforeach(icon) ++ endif(INSTALL_UBUNTU_ICONS) + endif (NOT APPLE) diff --git a/clementine-system-libechonest.patch b/clementine-system-libechonest.patch new file mode 100644 index 0000000..f9e4d98 --- /dev/null +++ b/clementine-system-libechonest.patch @@ -0,0 +1,40 @@ +diff -rupN clementine-0.6.old/CMakeLists.txt clementine-0.6/CMakeLists.txt +--- clementine-0.6.old/CMakeLists.txt 2010-11-21 10:13:26.000000000 -0500 ++++ clementine-0.6/CMakeLists.txt 2010-12-23 13:46:55.000000000 -0500 +@@ -216,7 +216,15 @@ else (USE_SYSTEM_QXT) + endif (NOT APPLE) + endif (USE_SYSTEM_QXT) + +-set(ECHONEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/3rdparty/libechonest) ++# Use system libechonest if it's available ++find_path(ECHONEST_INCLUDE_DIRS echonest/echonest_export.h) ++find_library(ECHONEST_LIBRARIES echonest) ++if(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES) ++add_subdirectory(3rdparty/libechonest) ++ set(ECHONEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/3rdparty/libechonest) ++ set(ECHONEST_LIBRARIES echonest) ++endif(NOT ECHONEST_INCLUDE_DIRS OR NOT ECHONEST_LIBRARIES) ++ + + # Subdirectories + add_subdirectory(src) +@@ -224,7 +232,6 @@ if (WIN32) + add_subdirectory(3rdparty/qtwin) + endif (WIN32) + add_subdirectory(3rdparty/universalchardet) +-add_subdirectory(3rdparty/libechonest) + add_subdirectory(tests) + add_subdirectory(dist) + add_subdirectory(tools/ultimate_lyrics_parser) +diff -rupN clementine-0.6.old/src/CMakeLists.txt clementine-0.6/src/CMakeLists.txt +--- clementine-0.6.old/src/CMakeLists.txt 2010-12-10 09:26:29.000000000 -0500 ++++ clementine-0.6/src/CMakeLists.txt 2010-12-23 13:47:27.000000000 -0500 +@@ -761,7 +761,7 @@ add_dependencies(clementine_lib pot) + + target_link_libraries(clementine_lib + chardet +- echonest ++ ${ECHONEST_LIBRARIES} + ${GOBJECT_LIBRARIES} + ${GLIB_LIBRARIES} + ${TAGLIB_LIBRARIES} diff --git a/clementine.spec b/clementine.spec index 7ba844b..e6617da 100644 --- a/clementine.spec +++ b/clementine.spec @@ -1,20 +1,20 @@ Name: clementine -Version: 0.5.3 -Release: 2%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: A music player and library organizer Group: Applications/Multimedia License: GPLv3+ and GPLv2+ URL: http://code.google.com/p/clementine-player Source0: http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz -# This 3rd party library is not needed on Linux. Patch accepted by upstream -# http://code.google.com/p/clementine-player/issues/detail?id=798 -Patch0: clementine-no-qtwin.patch -# Safeguard against a null pipeline in GstEngine::Play. From upstream trunk -# Fixes RHBZ#636544 -# http://code.google.com/p/clementine-player/source/detail?r=2063 -Patch1: clementine-gst-safeguard.patch - +# Use system echonest instead of the bundled copy +# From upstream trunk: +# http://code.google.com/p/clementine-player/source/detail?r=2440 +Patch0: clementine-system-libechonest.patch +# Don't install Ubuntu icons on Fedora +# From upstream trunk: +# http://code.google.com/p/clementine-player/source/detail?r=2445 +Patch1: clementine-no-ubuntu-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -23,6 +23,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: gstreamer-devel BuildRequires: gtest-devel +BuildRequires: libechonest-devel %ifnarch s390 s390x BuildRequires: libgpod-devel BuildRequires: libimobiledevice-devel @@ -52,8 +53,8 @@ advantage of Qt4. %prep %setup -q -%patch0 -p1 -b .noqtwin -%patch1 -p1 -b .gstsafeguard +%patch0 -p1 -b .echonest +%patch1 -p1 -b .no_ubuntu_icons # Remove all 3rdparty libraries exceph universalchardet # as it is not available as a separate library. @@ -119,6 +120,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Dec 23 2010 Orcan Ogetbil - 0.6-1 +- New upstream version + * Thu Oct 14 2010 Dan Horák - 0.5.3-2 - Update BRs for s390(x) diff --git a/sources b/sources index eac9dd7..b7b51fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3411a0e31bdab7a6693048e934996f40 clementine-0.5.3.tar.gz +7b7ee4c16f648a15eb2cff9ed2163e0e clementine-0.6.tar.gz