Update to KDE 3.5.1

Changes:
* JuK
  o Fix memory corruption bug causing crashes with recent glibc
    libraries.
  o Fix incorrect initial volume setting when using aKode as output.
  o Corrected list of file types that JuK supports.
  o Fix command line handling of music files. Now files given on the
    command line are automatically added to the Collection List.
  o Fix "Album Random Play" feature to also use Artist information when
    choosing the next track to play.
  o Added musicbrainz 0.4-support

5 files changed, 36 insertions, 27 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index b762a7b57fb..0c023526e58 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2006/01/24 07:32:27 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/01/31 22:33:02 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	4
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index 0cb6be9b245..ed43e4506e1 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2006/01/04 22:35:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.21 2006/01/31 22:33:02 markd Exp $
 bin/artsbuilder
 bin/artscontrol
 bin/juk
@@ -495,6 +495,7 @@ share/doc/kde/HTML/en/kscd/kscd3.png
 share/doc/kde/HTML/en/kscd/kscd5.png
 share/doc/kde/HTML/en/kscd/kscd6.png
 share/doc/kde/HTML/en/kscd/kscd9.png
+share/doc/kde/HTML/en/kscd/kscdannounc.png
 share/doc/kde/HTML/en/noatun/common
 share/doc/kde/HTML/en/noatun/index.cache.bz2
 share/doc/kde/HTML/en/noatun/index.docbook
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 5c2ebfd55ca..be2bea8d32b 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.24 2006/01/20 03:51:25 joerg Exp $
+$NetBSD: distinfo,v 1.25 2006/01/31 22:33:03 markd Exp $
 
-SHA1 (kdemultimedia-3.5.0.tar.bz2) = 0d64a4d748dee95d7f7dbc03eb4f538f8c0a133d
-RMD160 (kdemultimedia-3.5.0.tar.bz2) = 1609307178bed9f46c19fb99743789d4799f1b54
-Size (kdemultimedia-3.5.0.tar.bz2) = 5519386 bytes
-SHA1 (patch-aa) = 42309f8b9b3c30f29af09d7f84255a02cd8cdf91
+SHA1 (kdemultimedia-3.5.1.tar.bz2) = ce75b5d6639fe26eac6d81858264ba9196d450ba
+RMD160 (kdemultimedia-3.5.1.tar.bz2) = 3bd70140c078c8c3ba8c786970f63cc58355e6d4
+Size (kdemultimedia-3.5.1.tar.bz2) = 5502185 bytes
+SHA1 (patch-aa) = d3c1139e5c383a584ef227001ebd9d8179fd6430
 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
 SHA1 (patch-ad) = 4a84cd2246d61e521b1ce576328c755915304b10
@@ -17,4 +17,4 @@ SHA1 (patch-ak) = b55f0915a356949b00c588b25c0aa435aedc109d
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
-SHA1 (patch-cu) = cd0c0a11c850f658e69015681d3ccca9d4be7d37
+SHA1 (patch-cu) = 332029860aab3f34cf0b202958b09c2564d5e913
diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa
index 2dc8363d9bc..7b700a56d9e 100644
--- a/multimedia/kdemultimedia3/patches/patch-aa
+++ b/multimedia/kdemultimedia3/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
+$NetBSD: patch-aa,v 1.9 2006/01/31 22:33:03 markd Exp $
 
---- configure.orig	2005-11-26 07:14:02.000000000 +0000
+--- configure.orig	2006-01-21 06:48:39.000000000 +1300
 +++ configure
 @@ -28679,34 +28679,15 @@ if test $kde_qtver = 1; then
     kde_qt_dirs="$QTDIR /usr/lib/qt"
@@ -162,7 +162,16 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -37888,7 +37848,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
+@@ -35251,7 +35211,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-    #include <cdda_interface.h>
++    #include <cdparanoia/cdda_interface.h>
+ 
+ int
+ main ()
+@@ -38039,7 +37999,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -171,7 +180,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40058,8 +40018,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40209,8 +40169,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -197,7 +206,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -40122,7 +40097,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40273,7 +40248,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -220,7 +229,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -40186,7 +40176,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40337,7 +40327,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -243,7 +252,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -40258,6 +40263,9 @@ case "$OS_TYPE" in
+@@ -40409,6 +40414,9 @@ case "$OS_TYPE" in
    SunOS)
      kde_mpeglib_compiles=yes
      ;;
@@ -253,7 +262,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
    *)
      echo "$as_me:$LINENO: result: *** We disable mpeglib for this platform ***" >&5
  echo "${ECHO_T}*** We disable mpeglib for this platform ***" >&6
-@@ -40267,33 +40275,14 @@ esac
+@@ -40418,33 +40426,14 @@ esac
  
  
  
@@ -291,7 +300,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -40338,31 +40327,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -40489,31 +40478,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -330,7 +339,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
      echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
  echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-@@ -40415,6 +40396,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -40566,6 +40547,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
    ac_cv_lib_pthread_pthread_create=yes
@@ -338,7 +347,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -40427,10 +40409,6 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -40578,10 +40560,6 @@ LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
  echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
@@ -349,7 +358,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
    fi
  
      if test -z "$LIBPTHREAD" ; then
-@@ -40492,10 +40470,6 @@ rm -f conftest.err conftest.$ac_objext \
+@@ -40643,10 +40621,6 @@ rm -f conftest.err conftest.$ac_objext \
      LIBS=$kde_safe_libs
    fi
  
@@ -360,7 +369,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
  
  
  case "$OS_TYPE" in
-@@ -40517,7 +40491,7 @@ _ACEOF
+@@ -40668,7 +40642,7 @@ _ACEOF
  
      ;;
  
@@ -369,7 +378,7 @@ $NetBSD: patch-aa,v 1.8 2006/01/20 03:51:25 joerg Exp $
      OS_TYPE="BSD"
  
  cat >>confdefs.h <<\_ACEOF
-@@ -44966,11 +44940,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -45117,11 +45093,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF
  
  { (exit 0); exit 0; }
  _ACEOF
diff --git a/multimedia/kdemultimedia3/patches/patch-cu b/multimedia/kdemultimedia3/patches/patch-cu
index 86a6a5c8476..1bc406c537a 100644
--- a/multimedia/kdemultimedia3/patches/patch-cu
+++ b/multimedia/kdemultimedia3/patches/patch-cu
@@ -1,6 +1,6 @@
-$NetBSD: patch-cu,v 1.5 2005/12/11 11:20:51 markd Exp $
+$NetBSD: patch-cu,v 1.6 2006/01/31 22:33:03 markd Exp $
 
---- kioslave/audiocd/audiocd.cpp.orig	2005-11-09 11:26:44.000000000 +1300
+--- kioslave/audiocd/audiocd.cpp.orig	2006-01-20 05:40:34.000000000 +1300
 +++ kioslave/audiocd/audiocd.cpp
 @@ -26,8 +26,8 @@
  
@@ -11,9 +11,9 @@ $NetBSD: patch-cu,v 1.5 2005/12/11 11:20:51 markd Exp $
 +	#include <cdparanoia/cdda_interface.h>
 +	#include <cdparanoia/cdda_paranoia.h>
  	void paranoiaCallback(long, int);
- 	
+ 
  	#include <kdemacros.h>
-@@ -827,7 +827,7 @@ void AudioCDProtocol::paranoiaRead(
+@@ -859,7 +859,7 @@ void AudioCDProtocol::paranoiaRead(
  		 * 2) Only increase in size unless the decrease is %5 of last estimate.
  		 * This prevents continues small changes which is just annoying.
  		 */