[arch-commits] Commit in amarok/repos (3 files)

[Tobias Powalowski]

    Date: Wednesday, April 22, 2009 @ 04:11:09
  Author: tpowa
Revision: 36418

Merged revisions 36417 via svnmerge from 
svn+ssh://tpowa@archlinux.org/srv/svn-packages/amarok/trunk

........
  r36417 | tpowa | 2009-04-22 10:10:26 +0200 (Mi, 22 Apr 2009) | 2 lines
  
  'fix mysql and scrobble'
........

Added:
  amarok/repos/extra-x86_64/scrobble-2.0.2.patch
    (from rev 36417, amarok/trunk/scrobble-2.0.2.patch)
Modified:
  amarok/repos/extra-x86_64/	(properties)
  amarok/repos/extra-x86_64/PKGBUILD

----------------------+
 PKGBUILD             |   13 ++++++++-----
 scrobble-2.0.2.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)


Property changes on: amarok/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /amarok/trunk:1-35969
   + /amarok/trunk:1-36417

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-22 08:10:26 UTC (rev 36417)
+++ extra-x86_64/PKGBUILD	2009-04-22 08:11:09 UTC (rev 36418)
@@ -4,27 +4,30 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="amaroK - a media player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
 license=('GPL2')
-depends=('qt>=4.5' 'libmysqlclient>=5.1.34' 'kdebase-runtime>=4.2' 'kdelibs' 'phonon' 'strigi' 'taglib' 'libmtp>=0.3.0' 'libgpod>=0.7.0' 'libmp4v2' 'qtscriptgenerator')
+depends=('qt>=4.5' 'mysql>=5.1.34' 'libmysqlclient>=5.1.34' 'kdebase-runtime>=4.2' 'kdelibs' 'phonon' 'strigi' 'taglib' 'libmtp>=0.3.0' 'libgpod>=0.7.0' 'libmp4v2' 'qtscriptgenerator')
 # 2.1.0 depend taglib-extras
 makedepends=('pkgconfig' 'automoc4' 'loudmouth')
 # makedepend 2.1.0 qca
 install=amarok.install
 source=(ftp://ftp.solnet.ch/mirror/KDE/stable/amarok/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2
-        amarok-2.0.2-build.patch)
+        amarok-2.0.2-build.patch
+        scrobble-2.0.2.patch)
 optdepends=('loudmouth:  for mp3tunes support')
 # 2.1.0 'qca:        for ampache support'
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ../amarok-2.0.2-build.patch
+  patch -Np0 -i ../amarok-2.0.2-build.patch || return 1
+  patch -Np4 -i ../scrobble-2.0.2.patch || return 1
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_PATH=/usr/lib/mysql/libmysqld/
   make || return 1
   make DESTDIR=$startdir/pkg install
 }
 md5sums=('98b78372ec6ea3432faba356c90c6dbe'
-         'a37ee0bcdb77f3b3eec22c09aa9205c7')
+         'a37ee0bcdb77f3b3eec22c09aa9205c7'
+         '49fc5c968725dad2d89a6e2dcb3da2bf')

Copied: amarok/repos/extra-x86_64/scrobble-2.0.2.patch (from rev 36417, amarok/trunk/scrobble-2.0.2.patch)
===================================================================
--- extra-x86_64/scrobble-2.0.2.patch	                        (rev 0)
+++ extra-x86_64/scrobble-2.0.2.patch	2009-04-22 08:11:09 UTC (rev 36418)
@@ -0,0 +1,36 @@
+--- trunk/extragear/multimedia/amarok/src/services/lastfm/LastFmService.cpp     2009/04/03 17:16:06     948750
++++ trunk/extragear/multimedia/amarok/src/services/lastfm/LastFmService.cpp     2009/04/05 10:58:40     949421
+@@ -220,7 +220,6 @@
+     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
+ 
+     QString authToken =  md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() );
+-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
+     
+     // now authenticate w/ last.fm and get our session key
+     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
+@@ -230,7 +229,6 @@
+     .add( "username", m_userName )
+     .add( "authToken", authToken )
+     .add( "api_key", Ws::ApiKey )
+-    .add( "api_sig", sign_key )
+     .get();
+ 
+     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
+--- trunk/extragear/multimedia/amarok/src/services/lastfm/LastFmServiceSettings.cpp     2009/02/07 11:42:55     922607
++++ trunk/extragear/multimedia/amarok/src/services/lastfm/LastFmServiceSettings.cpp     2009/04/05 10:58:40     949421
+@@ -99,14 +99,12 @@
+     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
+ 
+     QString authToken =  md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() );
+-    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
+     
+     // now authenticate w/ last.fm and get our session key
+     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
+     .add( "username", m_configDialog->kcfg_ScrobblerUsername->text() )
+     .add( "authToken", authToken )
+     .add( "api_key", Ws::ApiKey )
+-    .add( "api_sig", sign_key )
+     .get();
+     
+     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
+