[clementine/f13/master] - New upstream version
Orcan Ogetbil
oget at fedoraproject.org
Mon Sep 27 05:22:10 UTC 2010
commit f12ef26dfcea9bd15c2545fa5c9e774341586f8a
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Mon Sep 27 01:22:13 2010 -0400
- New upstream version
.gitignore | 1 +
clementine-desktop-fix.patch | 9 --
clementine-fix-buildfags.patch | 13 ---
clementine-fix-lastfm-crash.patch | 24 ------
clementine-font-paths.patch | 12 ---
clementine-gst-safeguard.patch | 37 ++++++++
clementine-no-qtwin.patch | 77 +++++++++++++++++
clementine-system-projectM.patch | 120 ---------------------------
clementine-system-qtiocompressor.patch | 74 ----------------
clementine-system-qtsingleapplication.patch | 68 ---------------
clementine-system-qxt.patch | 69 ---------------
clementine-visualization-init.patch | 90 --------------------
clementine.spec | 82 +++++++-----------
sources | 2 +-
14 files changed, 148 insertions(+), 530 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 08688e3..4f68349 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
clementine-0.4.2.tar.gz
+/clementine-0.5.2.tar.gz
diff --git a/clementine-gst-safeguard.patch b/clementine-gst-safeguard.patch
new file mode 100644
index 0000000..40946ce
--- /dev/null
+++ b/clementine-gst-safeguard.patch
@@ -0,0 +1,37 @@
+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<GstStateChangeReturn> future = current_pipeline_->SetState(GST_STATE_PLAYING);
+ BoundFutureWatcher<GstStateChangeReturn, uint>* watcher =
+ new BoundFutureWatcher<GstStateChangeReturn, uint>(offset, this);
diff --git a/clementine-no-qtwin.patch b/clementine-no-qtwin.patch
new file mode 100644
index 0000000..985bcf0
--- /dev/null
+++ b/clementine-no-qtwin.patch
@@ -0,0 +1,77 @@
+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 <QColor>
+ #include <QPainter>
+@@ -36,6 +35,10 @@
+ # include <QX11Info>
+ #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.spec b/clementine.spec
index aea4ad9..eadceec 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,43 +1,20 @@
Name: clementine
-Version: 0.4.2
-Release: 9%{?dist}
+Version: 0.5.2
+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
-# The following patches 0-4 are from the upstream trunk
-# Fix trailing semicolon
-# http://code.google.com/p/clementine-player/source/detail?r=1486
-Patch0: clementine-desktop-fix.patch
-# The next 3 are to split out the bundled libraries
-# http://code.google.com/p/clementine-player/source/detail?r=1443
-Patch1: clementine-system-projectM.patch
-# http://code.google.com/p/clementine-player/source/detail?r=1444
-Patch2: clementine-system-qtsingleapplication.patch
-# http://code.google.com/p/clementine-player/source/detail?r=1445
-Patch3: clementine-system-qtiocompressor.patch
-# Also split qxt. Patch accepted by upstream
-#http://code.google.com/p/clementine-player/source/detail?r=1512
-Patch4: clementine-system-qxt.patch
-# We need to pass the font paths to the Renderer constructor of libprojectM.
-# Otherwise ftgl library segfaults. Note that this is not a problem if projectM
-# is not compiled with ftgl support. However, the Fedora package is. More
-# details on this at
-# http://code.google.com/p/clementine-player/issues/detail?id=291#c22
-Patch5: clementine-font-paths.patch
-# Fix lastFM crash RHBZ#618474
-# http://code.google.com/p/clementine-player/issues/detail?id=463
-# From upstream trunk
-Patch6: clementine-fix-lastfm-crash.patch
-# Enforce Fedora specific optimization flags. Accepted by upstream.
-# http://code.google.com/p/clementine-player/source/detail?r=1639
-Patch7: clementine-fix-buildfags.patch
-# Only create the OpenGL graphics context when you first open the visualisations
-# window. Fixes RHBZ#621913. From upstream trunk:
-# http://code.google.com/p/clementine-player/source/detail?spec=svn1661&r=1431
-Patch8: clementine-visualization-init.patch
+# 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
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -46,13 +23,18 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gstreamer-devel
BuildRequires: gtest-devel
+BuildRequires: libgpod-devel
+BuildRequires: libimobiledevice-devel
BuildRequires: liblastfm-devel
+BuildRequires: libmtp-devel
BuildRequires: libnotify-devel
+BuildRequires: libplist-devel
BuildRequires: libprojectM-devel >= 2.0.1-7
BuildRequires: libqxt-devel
BuildRequires: notification-daemon
BuildRequires: qt4-devel
BuildRequires: qtiocompressor-devel
+BuildRequires: qtsinglecoreapplication-devel
BuildRequires: qtsingleapplication-devel >= 2.6.1-2
BuildRequires: sqlite-devel
BuildRequires: taglib-devel
@@ -68,23 +50,14 @@ advantage of Qt4.
%prep
%setup -q
-%patch0 -p1 -b .desktopfix
-%patch1 -p1 -b .projectM
-%patch2 -p1 -b .qtsingleapplication
-%patch3 -p1 -b .qtiocompressor
-%patch4 -p1 -b .qxt
-%patch5 -p1 -b .fontpaths
-%patch6 -p1 -b .fix.lastfm.crash
-%patch7 -p1 -b .build.flags
-%patch8 -p1 -b .visual.init
-
-# We already don't use these but just to make sure
-rm -fr 3rdparty/gmock
-rm -fr 3rdparty/libprojectm
-rm -fr 3rdparty/qxt
-rm -fr 3rdparty/qsqlite
-rm -fr 3rdparty/qtiocompressor
-rm -fr 3rdparty/qtsingleapplication
+%patch0 -p1 -b .noqtwin
+%patch1 -p1 -b .gstsafeguard
+
+# Remove all 3rdparty libraries exceph universalchardet
+# as it is not available as a separate library.
+mv 3rdparty/universalchardet/ .
+rm -fr 3rdparty/*
+mv universalchardet/ 3rdparty/
# Don't build tests. They require gmock which is not yet available on Fedora
@@ -99,6 +72,7 @@ pushd %{_target_platform}
-DUSE_SYSTEM_QTSINGLEAPPLICATION=1 \
-DUSE_SYSTEM_PROJECTM=1 \
-DUSE_SYSTEM_QXT=1 \
+ -DSTATIC_SQLITE=0 \
..
@@ -139,9 +113,17 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/clementine
%{_datadir}/applications/clementine.desktop
%{_datadir}/icons/hicolor/64x64/apps/application-x-clementine.png
+%{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg
%changelog
+* Sun Sep 26 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.5.2-1
+- New upstream version
+
+* Wed Sep 22 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.5.1-1
+- New upstream version
+- Drop all upstreamed patches
+
* Sun Aug 08 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.4.2-9
- Only create the OpenGL graphics context when you first open the visualisations
window. Fixes RHBZ#621913
diff --git a/sources b/sources
index 6738093..7bf0dc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6819b0d2a8324f1d686fb5a3b1d287b clementine-0.4.2.tar.gz
+25122edeec1582c2b3a7e537e3b2fd18 clementine-0.5.2.tar.gz
More information about the scm-commits
mailing list