[arch-commits] CVS update of extra/multimedia/amarok-base (2 files)

[Damir Perisa]

    Date: Monday, August 13, 2007 @ 08:10:45
  Author: damir
    Path: /home/cvs-extra/extra/multimedia/amarok-base

Modified: PKGBUILD (1.44 -> 1.45)
 Removed: magnatune-fix-1.4.5.diff (1.2)

amarok update: release not before thursday!


--------------------------+
 PKGBUILD                 |   15 ++++++++-------
 magnatune-fix-1.4.5.diff |   28 ----------------------------
 2 files changed, 8 insertions(+), 35 deletions(-)


Index: extra/multimedia/amarok-base/PKGBUILD
diff -u extra/multimedia/amarok-base/PKGBUILD:1.44 extra/multimedia/amarok-base/PKGBUILD:1.45
--- extra/multimedia/amarok-base/PKGBUILD:1.44	Fri Jul  6 02:22:32 2007
+++ extra/multimedia/amarok-base/PKGBUILD	Mon Aug 13 08:10:45 2007
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD,v 1.44 2007/07/06 06:22:32 eric Exp $
+# $Id: PKGBUILD,v 1.45 2007/08/13 12:10:45 damir Exp $
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=amarok-base
 _origname=amarok
 replaces=("${_origname}" 'amarok-base-mysqlfree')
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="amaroK - a media player for KDE"
 arch=("i686" "x86_64")
-url="http://amarok.sourceforge.net/"
+url="http://amarok.kde.org"
 license=('GPL')
-depends=('amarok-engine' 'libmp4v2' 'libmysqlclient>=5.0.25' 'postgresql-libs>=8.2.3' 'ruby' 'tunepimp>=0.5.3')
-makedepends=('pkgconfig' 'kdebase>=3.5.6' 'libgpod>=0.4.2' 'libifp' 'libmtp>=0.1.3' 'libnjb>=2.0' 'libvisual>=0.4.0' 'xine-lib' 'sdl')
+depends=('amarok-engine' 'libmp4v2' 'libmysqlclient>=5.0.45' 'postgresql-libs>=8.2.4' 'ruby' 'tunepimp>=0.5.3')
+makedepends=('pkgconfig' 'kdebase>=3.5.7' 'libgpod>=0.5.2' 'libifp>=1.0.0.2' 'libmtp>=0.1.5' 'libnjb>=2.2.5' 'libvisual>=0.4.0' 'xine-lib>=1.1.7' 'sdl>=1.2.12')
 # advanced scripting depends on python
 install=amarok.install
 #source=(http://mark.kollide.net/amarok-${pkgver}.tar.bz2
 source=("ftp://ftp.solnet.ch/mirror/KDE/stable/amarok/${pkgver}/src/${_origname}-${pkgver}.tar.bz2"
-	amarok_addaspodcast.desktop)
-md5sums=('b3519d042732101acb74469746656cf0' '7736a7e3e22b15818180df3cee7e4a79')
+	"amarok_addaspodcast.desktop")
 
 build() {
   export MAKEFLAGS="-j1"
@@ -53,3 +52,5 @@
   mkdir -p ${startdir}/pkg/opt/kde/share/apps/konqueror/servicemenus/
   install -m644 ${startdir}/src/amarok_addaspodcast.desktop ${startdir}/pkg/opt/kde/share/apps/konqueror/servicemenus/
 }
+md5sums=('f1299e142da8a69bc3cff5d585e38d43'
+         '7736a7e3e22b15818180df3cee7e4a79')
Index: extra/multimedia/amarok-base/magnatune-fix-1.4.5.diff
diff -u extra/multimedia/amarok-base/magnatune-fix-1.4.5.diff:1.2 extra/multimedia/amarok-base/magnatune-fix-1.4.5.diff:removed
--- extra/multimedia/amarok-base/magnatune-fix-1.4.5.diff:1.2	Sun Apr  8 02:48:26 2007
+++ extra/multimedia/amarok-base/magnatune-fix-1.4.5.diff	Mon Aug 13 08:10:45 2007
@@ -1,28 +0,0 @@
-Index: src/magnatunebrowser/magnatunealbumdownloader.cpp
-===================================================================
---- amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp	(revision 633659)
-+++ amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp	(revision 633677)
-@@ -89,19 +89,19 @@
- 
-     //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection.
- 
--    QString unzipString = "unzip \""+m_tempDir.name() + m_currentAlbumFileName + "\" -d \"" + m_currentAlbumUnpackLocation + "\" &";
-+    QString unzipString = "unzip "+ KProcess::quote( m_tempDir.name() + m_currentAlbumFileName) + " -d " +KProcess::quote( m_currentAlbumUnpackLocation ) + " &";
- 
-     debug() << "unpacking: " << unzipString << endl;
- 
-     system( unzipString.ascii() );
- 
--  
- 
-+
-     if (m_currentAlbumId != -1 ) {
- 
--        //now I really want to add the album cover to the same folder where I just unzipped the album... The 
-+        //now I really want to add the album cover to the same folder where I just unzipped the album... The
-         //only way of getting the actual location where the album was unpacked is using the artist and album names
--   
-+
-         MagnatuneAlbum album = MagnatuneDatabaseHandler::instance()->getAlbumById( m_currentAlbumId );
-         MagnatuneArtist artist = MagnatuneDatabaseHandler::instance()->getArtistById( album.getArtistId() );
-