commit clementine for openSUSE:Factory
Hello community, here is the log from the commit of package clementine for openSUSE:Factory checked in at 2014-03-28 16:20:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clementine (Old) and /work/SRC/openSUSE:Factory/.clementine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clementine" Changes: -------- --- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2014-01-15 16:24:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.clementine.new/clementine.changes 2014-03-28 16:20:51.000000000 +0100 @@ -1,0 +2,28 @@ +Thu Mar 27 12:30:13 UTC 2014 - tchvatal@suse.com + +- Version bump to 1.2.2: + * upstream moved homepage + * android remote support + * Rename SkyDrive to OneDrive. + * Don't include the user's IP address in the log (from the network remote + settings dialog). + * (Debian) Fix a bug with HTTPS logins to all cloud storage providers. + * (Mac OS X) Fix a bug in the workaround for a weird font issue on 10.9. + * (Mac OS X) Fix rendering of source icons on retina displays. + * (Android Remote) Don't advertise songs that aren't available. + * (Android Remote) Fix playing songs with special characters in filenames. +- Cleanup with spec-cleaner +- Remove support for < 12.3 codepaths +- Remove unused patches: + * clementine-1.1.1-fixboostparseerror.patch + * clementine-desktop-fix.patch +- Add patches for build from upstream: + * clementine-1.2.2-add-missing-header.patch + * clementine-1.2.2-add-missing-include.patch +- Disable building with Werror, it is always bad idea to do so. +- Add dependency over udisks as it is used by build +- Use system projectM again as it seems to build fine. +- Bug workaround: disable DBUS interface as it fails to build for + some non-aparent reason. + +------------------------------------------------------------------- Old: ---- clementine-1.1.1-fixboostparseerror.patch clementine-1.2.1.tar.gz clementine-desktop-fix.patch New: ---- 1.2.2.tar.gz clementine-1.2.2-add-missing-header.patch clementine-1.2.2-add-missing-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clementine.spec ++++++ --- /var/tmp/diff_new_pack.DPRpaS/_old 2014-03-28 16:20:52.000000000 +0100 +++ /var/tmp/diff_new_pack.DPRpaS/_new 2014-03-28 16:20:52.000000000 +0100 @@ -17,19 +17,15 @@ Name: clementine -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: A cross-platform Music Player based on Amarok 1 License: GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Url: http://code.google.com/p/clementine-player/ -Source: http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz -### FIXME KDE taskbar can handle unity shortcuts -# PATCH-FIX-OPENSUSE clementine-desktop-fix.patch fisiu@opensuse.org -- remove unity related shortcuts -Patch0: clementine-desktop-fix.patch -### Patch to fix factory build failure due to an issue between boost and qt4. See : -# https://bugreports.qt-project.org/browse/QTBUG-22829 -Patch1: clementine-1.1.1-fixboostparseerror.patch +Url: http://www.clementine-player.org/ +Source: https://github.com/clementine-player/Clementine/archive/%{version}.tar.gz +Patch0: clementine-1.2.2-add-missing-header.patch +Patch1: clementine-1.2.2-add-missing-include.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: fdupes @@ -39,14 +35,8 @@ BuildRequires: help2man BuildRequires: hicolor-icon-theme BuildRequires: liblastfm-devel +BuildRequires: libqxt-devel BuildRequires: update-desktop-files -### TODO openSUSE < 1220 is EOL, Evergreen 11.4 will be soon -%if 0%{?suse_version} >= 1220 -BuildRequires: pkgconfig(protobuf) -%else -BuildRequires: libprotobuf-lite6 -BuildRequires: protobuf-devel -%endif BuildRequires: pkgconfig(QJson) BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtGui) @@ -63,19 +53,14 @@ BuildRequires: pkgconfig(libechonest) BuildRequires: pkgconfig(libgpod-1.0) BuildRequires: pkgconfig(libmtp) -%if 0%{?suse_version} >= 1310 -BuildRequires: pkgconfig(libmygpo-qt) >= 1.0.7 -%endif BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libprojectM) BuildRequires: pkgconfig(libxml-2.0) -%if 0%{?suse_version} >= 1230 -BuildRequires: pkgconfig(libsparsehash) -%endif -### NOTE 1.2 build fails with system libprojectM -# BuildRequires: pkgconfig(libprojectM) +BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(qca2) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(taglib) >= 1.8 +BuildRequires: pkgconfig(udisks) Requires: libtag1 >= 1.8 # plasma_runner dropped in clementine 1.1.0 Provides: %{name}-kde = %{version} @@ -83,6 +68,12 @@ # gnome indicator - while we don't have it in OSS we don't build it # BuildRequires: libindicator-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1310 +BuildRequires: pkgconfig(libmygpo-qt) >= 1.0.7 +%endif +%if 0%{?suse_version} >= 1230 +BuildRequires: pkgconfig(libsparsehash) +%endif %description Clementine is a modern music player and library organiser. Clementine is a @@ -97,10 +88,9 @@ * Native desktop notifications on Linux (libnotify) and Mac OS X (Growl) %prep -%setup -q -### FIXME KDE taskbar can handle unity shortcuts -# %%patch0 -%patch1 +%setup -q -n Clementine-%{version} +%patch0 -p1 +%patch1 -p1 ### NOTE built against system version of libraries rm -rvf 3rdparty/chromaprint @@ -111,16 +101,21 @@ %endif %build -%{cmake} \ +%cmake \ + -DBUILD_WERROR=OFF \ + -DUSE_SYSTEM_PROJECTM=ON \ + -DBUNDLE_PROJECTM_PRESETS=OFF \ + -DUSE_SYSTEM_QXT=ON \ + -DUSE_BUILTIN_TAGLIB=OFF \ %if 0%{?suse_version} >= 1230 -DENABLE_GOOGLE_DRIVE=ON \ %endif - -DENABLE_MOODBAR=ON + -DENABLE_MOODBAR=ON \ + -DENABLE_DBUS=OFF make %{?_smp_mflags} %install -cd build -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%cmake_install %suse_update_desktop_file clementine Qt KDE AudioVideo Audio Player # Generate man page with help2man @@ -135,11 +130,11 @@ %post %desktop_database_post -%{icon_theme_cache_post} +%icon_theme_cache_post %postun %desktop_database_postun -%{icon_theme_cache_postun} +%icon_theme_cache_postun %files %defattr(-,root,root) @@ -149,8 +144,6 @@ %{_datadir}/applications/clementine.desktop %{_datadir}/icons/hicolor/64x64/apps/application-x-clementine.png %{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg -%dir %{_datadir}/clementine -%{_datadir}/clementine/projectm-presets %dir %{_datadir}/kde4/ %dir %{_datadir}/kde4/services/ %{_datadir}/kde4/services/clementine-feed.protocol ++++++ clementine-1.2.1.tar.gz -> 1.2.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/clementine/clementine-1.2.1.tar.gz /work/SRC/openSUSE:Factory/.clementine.new/1.2.2.tar.gz differ: char 5, line 1 ++++++ clementine-1.2.2-add-missing-header.patch ++++++
From 3df3a5b645737603af6bda844db04c431b9c8064 Mon Sep 17 00:00:00 2001 From: John Maguire
Date: Thu, 6 Feb 2014 19:03:10 +0100 Subject: [PATCH] Add missing header for syscall().
This is cunningly not defined in syscall.h
---
src/core/utilities.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
index 6fce753..cb9a94d 100644
--- a/src/core/utilities.cpp
+++ b/src/core/utilities.cpp
@@ -52,6 +52,7 @@
#endif
#ifdef Q_OS_LINUX
+# include
From 7671108aa8d02658cd35cacf4337507cc80ea03a Mon Sep 17 00:00:00 2001 From: John Maguire
Date: Thu, 6 Feb 2014 19:46:08 +0100 Subject: [PATCH] Add missing include for symlink()
---
src/internet/spotifyblobdownloader.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/internet/spotifyblobdownloader.cpp b/src/internet/spotifyblobdownloader.cpp
index 9827d65..5bd12a0 100644
--- a/src/internet/spotifyblobdownloader.cpp
+++ b/src/internet/spotifyblobdownloader.cpp
@@ -15,8 +15,9 @@
along with Clementine. If not, see http://www.gnu.org/licenses/.
*/
-#include "config.h"
#include "spotifyblobdownloader.h"
+
+#include "config.h"
#include "spotifyservice.h"
#include "core/logging.h"
#include "core/network.h"
@@ -32,6 +33,10 @@
#include <QtCrypto>
#endif // HAVE_QCA
+#ifdef Q_OS_UNIX
+ #include
participants (1)
-
root@hilbert.suse.de