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

[Damir Perisa]

    Date: Friday, December 28, 2007 @ 10:44:32
  Author: damir
    Path: /home/cvs-extra/extra/multimedia/amarok-base

Modified: PKGBUILD (1.46 -> 1.47) amarok.install (1.6 -> 1.7)
 Removed: 148317.patch (1.1)

upgpkg: amarok-base 1.4.8-1


----------------+
 148317.patch   |   15 ---------------
 PKGBUILD       |   21 +++++++--------------
 amarok.install |    2 +-
 3 files changed, 8 insertions(+), 30 deletions(-)


Index: extra/multimedia/amarok-base/148317.patch
diff -u extra/multimedia/amarok-base/148317.patch:1.1 extra/multimedia/amarok-base/148317.patch:removed
--- extra/multimedia/amarok-base/148317.patch:1.1	Sun Nov 18 21:04:57 2007
+++ extra/multimedia/amarok-base/148317.patch	Fri Dec 28 10:44:32 2007
@@ -1,15 +0,0 @@
-diff -urNad amarok-1.4.7/amarok/src/playlist.cpp amarok-1.4.8/amarok/src/playlist.cpp
---- amarok-1.4.7/amarok/src/playlist.cpp	2007-08-07 18:48:28.000000000 +0100
-+++ amarok-1.4.8/amarok/src/playlist.cpp	2007-11-18 15:00:25.000000000 +0100
-@@ -1227,7 +1227,10 @@
-     }
-     else
-     {
--        if ( !AmarokConfig::randomMode() || m_prevTracks.count() <= 1 )
-+        if( dynamicMode() )
-+        {
-+        }
-+        else if( !AmarokConfig::randomMode() || m_prevTracks.count() <= 1 )
-         {
-             if( item )
-             {
Index: extra/multimedia/amarok-base/PKGBUILD
diff -u extra/multimedia/amarok-base/PKGBUILD:1.46 extra/multimedia/amarok-base/PKGBUILD:1.47
--- extra/multimedia/amarok-base/PKGBUILD:1.46	Sun Nov 18 21:04:57 2007
+++ extra/multimedia/amarok-base/PKGBUILD	Fri Dec 28 10:44:32 2007
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD,v 1.46 2007/11/19 02:04:57 damir Exp $
+# $Id: PKGBUILD,v 1.47 2007/12/28 15:44:32 damir Exp $
 # Maintainer: damir <damir at archlinux.org>
 
 pkgname=amarok-base
 _origname=amarok
 replaces=("${_origname}" 'amarok-base-mysqlfree')
-pkgver=1.4.7
-pkgrel=2
+pkgver=1.4.8
+pkgrel=1
 pkgdesc="amaroK - a media player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org"
 license=('GPL')
 depends=('amarok-engine' 'qt3' '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.2.2' 'libnjb>=2.2.5' 'libvisual>=0.4.0' 'xine-lib>=1.1.7' 'sdl>=1.2.12')
+makedepends=('pkgconfig' 'kdebase>=3.5.7' 'libgpod>=0.5.2' 'libifp>=1.0.0.2' 'libmtp>=0.2.4' 'libnjb>=2.2.5' 'libvisual>=0.4.0' 'xine-lib>=1.1.8' '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"
-	"148317.patch")
+	"amarok_addaspodcast.desktop")
 
 build() {
   export MAKEFLAGS="-j1"
@@ -25,12 +24,7 @@
   [ -z "${QTDIR}" ] && . /etc/profile.d/qt3.sh
   [ -z "${KDEDIR}" ] && . /etc/profile.d/kde.sh
    
-   # fix upstream bug	
-   # http://bugs.kde.org/show_bug.cgi?id=148317
-   # dynamic mode floods playlist and locks amarok
-    patch -Np1 -i $startdir/src/148317.patch
-
-   # prepare build
+  # prepare build
   ./configure --prefix=/opt/kde \
   	--with-gnu-ld \
 	--enable-mysql \
@@ -62,5 +56,4 @@
   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/amarok.install
diff -u extra/multimedia/amarok-base/amarok.install:1.6 extra/multimedia/amarok-base/amarok.install:1.7
--- extra/multimedia/amarok-base/amarok.install:1.6	Sun Nov 18 21:04:57 2007
+++ extra/multimedia/amarok-base/amarok.install	Fri Dec 28 10:44:32 2007
@@ -17,7 +17,7 @@
   echo "     \-  iPod:                               'libgpod'    "
   echo "     \-  iRiver:                             'libifp'     "
   echo "     \-  Creative Nomad, Dell DJ and others: 'libnjb' >=2.0  "
-  echo "     \-  devices supporting Microsoft MTP:   'libmtp' >=0.2.2 "
+  echo "     \-  devices supporting Microsoft MTP:   'libmtp' >=0.2.4 "
   echo "        "
 }