6 files changed, 31 insertions, 32 deletions

diff --git a/audio/last.fm/files/last.fm b/audio/last.fm/files/last.fm
deleted file mode 100644
index 56a3560451ec..000000000000
--- a/audio/last.fm/files/last.fm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# executes all *nix variants of Last.fm executable --mxcl
-
-RUNDIR=/usr/local/share/last.fm
-LD_LIBRARY_PATH=$RUNDIR; export LD_LIBRARY_PATH
-
-if [ -f $RUNDIR/last.fm.app ]; then
-    exec $RUNDIR/last.fm.app $*
-elif [ -f $RUNDIR/last.fm.app_debug ]; then
-    exec $RUNDIR/last.fm.app_debug $*
-elif [ -d $RUNDIR/Last.fm.app ]; then
-    exec $RUNDIR/Last.fm_debug $*
-fi
diff --git a/audio/last.fm/files/patch-src-AudioController.cpp b/audio/last.fm/files/patch-src-AudioController.cpp
index 29efbebc50a9..fa671556dec2 100644
--- a/audio/last.fm/files/patch-src-AudioController.cpp
+++ b/audio/last.fm/files/patch-src-AudioController.cpp
@@ -1,9 +1,9 @@
---- src/AudioController.cpp.orig	Sat Jul 14 09:50:13 2007
-+++ src/AudioController.cpp	Sat Jul 14 09:50:28 2007
-@@ -160,13 +160,7 @@
-     }
+--- src/AudioController.cpp.orig	2007-12-18 15:18:20.000000000 +0100
++++ src/AudioController.cpp	2009-11-04 19:22:00.000000000 +0100
+@@ -168,13 +168,7 @@
+ 
      m_transcode->setBufferCapacity( kDecodedBufferMinSize );
-     
+ 
 -    #ifdef WIN32
          m_output = qobject_cast<OutputInterface*>( loadPlugin( "rtaudioplayback" ) );
 -    #elif defined LINUX
@@ -13,4 +13,4 @@
 -    #endif
  
      if ( m_output == 0 )
-     {
+         return false;
diff --git a/audio/last.fm/files/patch-src-Helper-mediadevicewather.cpp b/audio/last.fm/files/patch-src-Helper-mediadevicewather.cpp
new file mode 100644
index 000000000000..d5d6da6f7f4b
--- /dev/null
+++ b/audio/last.fm/files/patch-src-Helper-mediadevicewather.cpp
@@ -0,0 +1,10 @@
+--- src/Helper/mediadevicewatcher.cpp.orig	2009-11-04 22:48:51.000000000 +0100
++++ src/Helper/mediadevicewatcher.cpp	2009-11-04 22:50:13.000000000 +0100
+@@ -73,6 +73,7 @@
+             QString appExe = "Last.fm_debug";
+         #endif
+     #endif
++    QString appExe = "last.fm";
+ 
+     QString app = QCoreApplication::applicationDirPath() + "/" + appExe;
+     QStringList params( "-tray" );
diff --git a/audio/last.fm/files/patch-src-mediadevice-itunes-itunesdevice.cpp b/audio/last.fm/files/patch-src-mediadevice-itunes-itunesdevice.cpp
new file mode 100644
index 000000000000..59dce4a1dcb0
--- /dev/null
+++ b/audio/last.fm/files/patch-src-mediadevice-itunes-itunesdevice.cpp
@@ -0,0 +1,13 @@
+--- src/mediadevices/itunes/itunesdevice.cpp.orig	2009-11-04 22:07:06.000000000 +0100
++++ src/mediadevices/itunes/itunesdevice.cpp	2009-11-04 22:07:12.000000000 +0100
+@@ -589,8 +589,9 @@
+             //HACK
+         #ifdef WIN32
+             QDir qcd = m_path;
+-        #endif
+             QSettings().setValue( "devicePaths/" + uid + "/path", qcd.absolutePath() );
++        #endif
++
+             //HACK
+         }
+         else
diff --git a/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h b/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h
index bf6952d5b72e..a9d30beadad3 100644
--- a/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h
+++ b/audio/last.fm/files/patch-src_LastFMHelper-controlinterface.h
@@ -1,5 +1,5 @@
---- src/LastFMHelper/controlinterface.h.orig	2007-09-24 23:41:54.000000000 +0200
-+++ src/LastFMHelper/controlinterface.h	2007-09-24 23:42:01.000000000 +0200
+--- src/Helper/controlinterface.h.orig	2007-09-24 23:41:54.000000000 +0200
++++ src/Helper/controlinterface.h	2007-09-24 23:42:01.000000000 +0200
 @@ -24,6 +24,7 @@
  
  #include <QObject>
diff --git a/audio/last.fm/files/patch-src_mp3transcode_mp3transcode.cpp b/audio/last.fm/files/patch-src_mp3transcode_mp3transcode.cpp
deleted file mode 100644
index 4f9fe9e64aed..000000000000
--- a/audio/last.fm/files/patch-src_mp3transcode_mp3transcode.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mp3transcode/mp3transcode.cpp.orig	2007-09-27 17:37:07.000000000 +0300
-+++ src/mp3transcode/mp3transcode.cpp	2008-09-08 01:43:36.000000000 +0300
-@@ -281,7 +281,7 @@
- {
-     int length;
-     int cnt;
--    length = qMin( numBytes, ssize_t( getDecodedBufferFilled() ) );
-+    length = qMin( numBytes, getDecodedBufferFilled() );
- 
-     while (length > 0)
-     {