Update to 1.4.8:

VERSION 1.4.8
  CHANGES:
    * Optimise some database queries with the mysql backend. Patch by Alf
      Eaton <sites@hubmed.org> (BR 152749).
    * Don't show the device plugin dialog when a new device is plugged in.
      Apparently it's not obvious that you have to hit OK after selecting "Do
      not handle" if you don't want it handled, so disabling it prevents it
      from being shown repeatedly.
    * Better support for iPhone/iPod Touch mounted via fuse/sshfs (libgpod 0.6.0
      or newer required).
    * Only re-render the context view when visible if changing ratings, scores
      or labels for songs.

  BUGFIXES:
    * Last.fm metadata would not update with xine 1.1.8. (BR 150429)
    * Amarok would forget podcast channel and episode settings when using the
      postgresql backend.
    * When adding file types with the Generic Media Device sometimes the
      extensions would be prepended with & and would not save. (BR 151806)
    * For improved compatibility with newer iPods, convert file extensions to
      lower case during transfer.
    * Replace slashes in artist name with spaces when querying Wikipedia
      e.g. AC/DC, To/Die/For. (BR 150001)
    * Always rebuild the dynamic mode cache when in Suggested songs mode,
      so that we don't land up with stale suggestions. Patch by Jer Johnson
      <jer@gweep.net>
    * Sort albums made in the same year alphabetically in 'ascending
      order'. (BR 149408)
    * Statistics tool shouldn't show samplers in 'favorite albums'.
    * Duplicate songs were not allowed in playlist when adding from the
      collection browser. (BR 149643)
    * Make sure the localUrl of a PodcastEpisode is valid after a failed
      download. (BR 147351)
    * Fix off-by-one error causing Smart Playlists to not load tracks with a
      rating >= 4.5. (BR 148916)
    * Don't enable "Configure Podcasts" at the top-level Podcasts folder if
      there is nothing beneath it. (BR 146504)
    * Generic Media Device could copy some non-ASCII filenames to turn to
      gibberish.  Thanks to David Smith <davidsmith@acm.org> for the fix.
    * Fixed possible GUI freeze when Amarok was showing the dialog for
      installing mp3 support. Patch by Sascha Sommer <ssommer@suse.de>.
      (BR 147126)
    * Amarok could needlessely reinitialize connections to MySQL databases
      after a configuration change.  Combined with a bug in MySQL libraries,
      this could lead to a crash.
    * Pressing Preveious Track in a Dynamic Playlist could cause undefined
      behavior in certain edge conditions.  Now it always plays the current
      track. (BR 148317)
    * Immediately after loading a dynamic playlist, you couldn't drag a
      track to the top of the playlist. (BR 149263)
    * Fix transferring files with UTF8 names to MTP devices. Thanks to Kevin
      Becker <kevman3000@gmail.com> for the fix. (BR 139722)
    * Display warning that iPod sysinfo could not be written in the case of
      incorrect file permissions. Patch by Christian Ober-Blöbaum
      <cob@tzi.de>. (BR 148607)
    * Fix Czech character conversion to ASCII for Generic Media Device. Patch
      by Matěj Laitl <strohel@gmail.com>. (BR 149125)

3 files changed, 6 insertions, 24 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 893c8d7fc75..af1d235b1d4 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2007/11/30 21:55:04 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2008/01/15 22:38:59 wiz Exp $
 
 DISTNAME=		amarok-${VERSION}
-VERSION=		1.4.7
-PKGREVISION=		2
+VERSION=		1.4.8
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 0e59d0a1b67..24f159ee9cd 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.31 2007/11/19 09:54:09 dillo Exp $
+$NetBSD: distinfo,v 1.32 2008/01/15 22:38:59 wiz Exp $
 
-SHA1 (amarok-1.4.7.tar.bz2) = ff97ad833159f4be32c0dfe546a6dee944f5339d
-RMD160 (amarok-1.4.7.tar.bz2) = fc5f5182b488f629cc608aee16aa84a0c4978dcd
-Size (amarok-1.4.7.tar.bz2) = 12723499 bytes
-SHA1 (patch-aa) = 55a55cb4e2c3aa7f1efac997036f8104af187b13
+SHA1 (amarok-1.4.8.tar.bz2) = 8051efa40483271fe6b7d229da9b4d7af3142348
+RMD160 (amarok-1.4.8.tar.bz2) = b557f6f5f14c304ae82c8d5537263ecc1faa922e
+Size (amarok-1.4.8.tar.bz2) = 12699378 bytes
 SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
deleted file mode 100644
index 4d7ab406901..00000000000
--- a/audio/amarok/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2007/11/19 09:54:09 dillo Exp $
-
---- amarok/src/metadata/mp4/mp4file.cpp.orig	2007-08-07 19:48:28.000000000 +0200
-+++ amarok/src/metadata/mp4/mp4file.cpp
-@@ -156,10 +156,7 @@ bool MP4::File::save()
-     }
- #endif
- 
--    if(!MP4Close(handle))
--    {
--        fprintf(stderr, "close failed\n");
--    }
-+    MP4Close(handle);
- 
-     mp4file = MP4Read(name());
-     if(mp4file == MP4_INVALID_FILE_HANDLE)