aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2015-05-28 22:52:36 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit1abc06427b6a1251b7fd0c23d6be61ff6650de4f (patch)
tree69e40f33b0b524711100f41c668d3797075d9b6c
parentae926fd3e2e315a837f4fa6faa355352bed0408d (diff)
audio/lastfm: Fixed build on -current.
Signed-off-by: David Spencer <baildon.research@googlemail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--audio/lastfm/github-192b979c57a.patch22
-rw-r--r--audio/lastfm/lastfm.SlackBuild3
2 files changed, 25 insertions, 0 deletions
diff --git a/audio/lastfm/github-192b979c57a.patch b/audio/lastfm/github-192b979c57a.patch
new file mode 100644
index 0000000000000..fc3e682d2a865
--- /dev/null
+++ b/audio/lastfm/github-192b979c57a.patch
@@ -0,0 +1,22 @@
+From 192b979c57aa0b9a2df4f11ad4851ce4fbf5d38b Mon Sep 17 00:00:00 2001
+From: Spiek <spiek@ymail.com>
+Date: Fri, 27 Dec 2013 13:27:11 +0100
+Subject: [PATCH] Fix missing Cast
+
+---
+ app/client/Services/RadioService/RadioService.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/client/Services/RadioService/RadioService.cpp b/app/client/Services/RadioService/RadioService.cpp
+index 05f22c8..10094b6 100644
+--- a/app/client/Services/RadioService/RadioService.cpp
++++ b/app/client/Services/RadioService/RadioService.cpp
+@@ -307,7 +307,7 @@ RadioService::mute()
+ void
+ RadioService::onPhononStateChanged( Phonon::State newstate, Phonon::State oldstate )
+ {
+- qDebug() << oldstate << " -> " << newstate;
++ qDebug() << (int)oldstate << " -> " << (int)newstate;
+ if (m_mediaObject == 0) {
+ qDebug() << "m_mediaObject is null!";
+ return;
diff --git a/audio/lastfm/lastfm.SlackBuild b/audio/lastfm/lastfm.SlackBuild
index b08ad8f54b9dd..142b932ef6ba2 100644
--- a/audio/lastfm/lastfm.SlackBuild
+++ b/audio/lastfm/lastfm.SlackBuild
@@ -74,6 +74,9 @@ cat $CWD/package-paths.patch | sed -e "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" \
| patch -p1
# Fix for ffmpeg 2.x.
patch -p1 < $CWD/ffmpeg-2.0.patch
+# Fix for "ambiguous overload for ‘operator<<’" in gcc-4.9
+# thanks to Spiek on github (https://github.com/lastfm/lastfm-desktop/pull/44)
+patch -p1 < $CWD/github-192b979c57a.patch
# Turn on verbose compile output.
sed -i 's|^CONFIG.*|#&|' admin/include.qmake