Update to KDE SC 4.8.0

9 files changed, 63 insertions, 40 deletions

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index c0353c2a154..cf8b36b9f39 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2012/03/03 00:13:40 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2012/03/19 20:22:32 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	10
+PKGNAME=	${DISTNAME:S/-4/4-4/}
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -10,7 +10,8 @@ COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 # BUILD_MAKE_FLAGS+= VERBOSE=1
 
 REPLACE_BASH+=	kioslave/audiocd/upgrade-metadata.sh
-USE_TOOLS+=	bash:run
+
+CMAKE_ARGS+=-DTAGLIB_MIN_VERSION=1.10
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -20,7 +21,7 @@ USE_TOOLS+=	bash:run
 .include "../../audio/cdparanoia/buildlink3.mk"
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libtunepimp/buildlink3.mk"
-.include "../../audio/musicbrainz/buildlink3.mk"
+.include "../../audio/libmusicbrainz/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
@@ -29,7 +30,7 @@ BUILDLINK_ABI_DEPENDS.xine-lib?=	xine-lib>=1.1.19nb1
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/kdebase-runtime4/buildlink3.mk"
+.include "../../x11/kde-runtime4/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kdemultimedia4/PLIST b/multimedia/kdemultimedia4/PLIST
index 64e9db7dd6b..b5fe74a4032 100644
--- a/multimedia/kdemultimedia4/PLIST
+++ b/multimedia/kdemultimedia4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/12/06 11:43:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/03/19 20:22:32 markd Exp $
 bin/dragon
 bin/juk
 bin/kmix
@@ -19,31 +19,35 @@ lib/kde4/dragonpart.so
 lib/kde4/ffmpegthumbs.so
 lib/kde4/kcm_audiocd.so
 lib/kde4/kcm_cddb.so
+lib/kde4/kded_kmixd.so
 lib/kde4/kio_audiocd.so
 lib/kde4/libaudiocd_encoder_flac.so
 lib/kde4/libaudiocd_encoder_lame.so
 lib/kde4/libaudiocd_encoder_vorbis.so
 lib/kde4/libaudiocd_encoder_wav.so
+lib/kde4/plasma_engine_mixer.so
 lib/kde4/videopreview.so
 lib/libaudiocdplugins.so
 lib/libaudiocdplugins.so.4
-lib/libaudiocdplugins.so.4.5.0
+lib/libaudiocdplugins.so.4.8.0
 lib/libkcddb.so
 lib/libkcddb.so.4
-lib/libkcddb.so.4.5.0
+lib/libkcddb.so.4.8.0
 lib/libkcompactdisc.so
 lib/libkcompactdisc.so.4
-lib/libkcompactdisc.so.4.5.0
+lib/libkcompactdisc.so.4.8.0
 lib/libkdeinit4_kmix.so
 lib/libkdeinit4_kmixctrl.so
 share/applications/kde4/dragonplayer.desktop
 share/applications/kde4/juk.desktop
 share/applications/kde4/kmix.desktop
 share/applications/kde4/kscd.desktop
-share/dbus-1/interfaces/org.kde.KMix.xml
 share/dbus-1/interfaces/org.kde.juk.collection.xml
 share/dbus-1/interfaces/org.kde.juk.player.xml
 share/dbus-1/interfaces/org.kde.juk.search.xml
+share/dbus-1/interfaces/org.kde.kmix.control.xml
+share/dbus-1/interfaces/org.kde.kmix.mixer.xml
+share/dbus-1/interfaces/org.kde.kmix.mixset.xml
 share/dbus-1/interfaces/org.kde.kscd.cdplayer.xml
 share/doc/kde/HTML/en/dragonplayer/common
 share/doc/kde/HTML/en/dragonplayer/index.cache.bz2
@@ -114,6 +118,7 @@ share/kde/apps/juk/jukui-rtl.rc
 share/kde/apps/juk/jukui.rc
 share/kde/apps/juk/pics/playing.png
 share/kde/apps/juk/pics/splash.png
+share/kde/apps/juk/pics/theme.svg
 share/kde/apps/juk/pics/yahoo_credit.png
 share/kde/apps/kconf_update/audiocd.upd
 share/kde/apps/kconf_update/kcmcddb-emailsettings.upd
@@ -137,13 +142,17 @@ share/kde/apps/kmix/pics/mixer-pcm-default.png
 share/kde/apps/kmix/pics/mixer-pcm.png
 share/kde/apps/kmix/pics/mixer-surround.png
 share/kde/apps/kmix/pics/mixer-video.png
+share/kde/apps/kmix/profiles/ALSA.TerraTec_DMX6Fire.1.default.xml
+share/kde/apps/kmix/profiles/ALSA.capture.xml
 share/kde/apps/kmix/profiles/ALSA.default.xml
+share/kde/apps/kmix/profiles/ALSA.playback.xml
 share/kde/apps/kmix/profiles/OSS.default.xml
 share/kde/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
 share/kde/apps/kscd/skin/Chrome.svg
 share/kde/apps/kscd/skin/Obsidian-Coast.svg
 share/kde/apps/kscd/skin/Steel.svg
 share/kde/apps/kscd/skin/default.svg
+share/kde/apps/plasma/services/mixer.operations
 share/kde/apps/solid/actions/dragonplayer-opendvd.desktop
 share/kde/apps/solid/actions/kscd-play-audiocd.desktop
 share/kde/apps/solid/actions/solid_audiocd.desktop
@@ -164,6 +173,8 @@ share/kde4/services/audiocd.desktop
 share/kde4/services/audiocd.protocol
 share/kde4/services/dragonplayer_part.desktop
 share/kde4/services/ffmpegthumbs.desktop
+share/kde4/services/kded/kmixd.desktop
 share/kde4/services/kmixctrl_restore.desktop
 share/kde4/services/libkcddb.desktop
+share/kde4/services/plasma-engine-mixer.desktop
 share/kde4/services/videopreview.desktop
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 5eb663fac4f..74034cc7598 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2011/01/23 07:55:15 markd Exp $
+$NetBSD: distinfo,v 1.14 2012/03/19 20:22:32 markd Exp $
 
-SHA1 (kdemultimedia-4.5.5.tar.bz2) = fe3f30a5491d3384298c4f68ebed136bc83ba8a6
-RMD160 (kdemultimedia-4.5.5.tar.bz2) = 40184bc6023bdd61b9a876c14bc0b997b43fb683
-Size (kdemultimedia-4.5.5.tar.bz2) = 1588980 bytes
-SHA1 (patch-ac) = 27d242ae4dd8e9ac8e3a12c35e5f588a6acbb8d5
-SHA1 (patch-ad) = 8901537664189b95f54f06b429362ac15df5afa9
-SHA1 (patch-af) = c6ce9d8c45ca25ce5fb9ea8f0e26344cc7c70e15
-SHA1 (patch-ag) = 8242c31fff139a128688c72c6ae36840138d1492
-SHA1 (patch-ah) = 53ee197c6a39a8b5cae2273dc57bfcfdce281e28
-SHA1 (patch-al) = df1832fe6dfd1bb31660a91e32731d0cc14b8f36
+SHA1 (kdemultimedia-4.8.0.tar.bz2) = 210bfd435c8e6f52aa78ab46f9487a159ab2ac83
+RMD160 (kdemultimedia-4.8.0.tar.bz2) = c53599e48a513d6806bff71bf36d56be6cfbd88a
+Size (kdemultimedia-4.8.0.tar.bz2) = 1629089 bytes
+SHA1 (patch-ac) = ae443a0f352bf2eaa64c8f258fb5f10b1eaf468a
+SHA1 (patch-ad) = 6137e6479ff6b0f16067f88686ae166d7d605f80
+SHA1 (patch-af) = c5f9f5a41bc51a7277bb0fbf6a254aa1df75daa3
+SHA1 (patch-ag) = d89cfead913fe6fa256f05e0375a053ffd3a691c
+SHA1 (patch-ah) = 164e571518a7a9ba31652aeabb745efe23832bc2
+SHA1 (patch-al) = 0e883a2b5fab6a0ee2b087bb4868ed634fa5fae4
diff --git a/multimedia/kdemultimedia4/patches/patch-ac b/multimedia/kdemultimedia4/patches/patch-ac
index fbb0ee8c202..1acce2aa5be 100644
--- a/multimedia/kdemultimedia4/patches/patch-ac
+++ b/multimedia/kdemultimedia4/patches/patch-ac
@@ -1,17 +1,28 @@
-$NetBSD: patch-ac,v 1.2 2010/04/10 02:45:04 markd Exp $
+$NetBSD: patch-ac,v 1.3 2012/03/19 20:22:32 markd Exp $
 
---- kmix/CMakeLists.txt.orig	2009-12-10 23:15:09.000000000 +0000
+Add $ENV{LIBOSSAUDIO}
+
+--- kmix/CMakeLists.txt.orig	2011-10-20 20:56:27.000000000 +0000
 +++ kmix/CMakeLists.txt
-@@ -40,7 +40,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
+@@ -82,7 +82,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
  
  kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
  
--target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
-+target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+-target_link_libraries(kdeinit_kmix ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(kdeinit_kmix ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+ #target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} /home/kde/workspace/kdelibs/build/lib/libsolid.so.4.7.0 ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
+ 
+ if (HAVE_LIBASOUND2)
+@@ -119,7 +119,7 @@ install(TARGETS kmix  ${INSTALL_TARGETS_
+ kde4_add_plugin(kded_kmixd ${kded_kmixd_SRCS})
+ 
+ 
+-target_link_libraries(kded_kmixd ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(kded_kmixd ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
  
  if (HAVE_LIBASOUND2)
-     target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})
-@@ -73,7 +73,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
+     target_link_libraries(kded_kmixd ${ASOUND_LIBRARY})
+@@ -154,7 +154,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
  
  kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})
  
diff --git a/multimedia/kdemultimedia4/patches/patch-ad b/multimedia/kdemultimedia4/patches/patch-ad
index 8d232c019da..86aac4d685a 100644
--- a/multimedia/kdemultimedia4/patches/patch-ad
+++ b/multimedia/kdemultimedia4/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+$NetBSD: patch-ad,v 1.2 2012/03/19 20:22:32 markd Exp $
 
---- kmix/tests/CMakeLists.txt.orig	2008-12-22 09:21:07.000000000 +1300
+--- kmix/tests/CMakeLists.txt.orig	2011-01-19 22:23:29.000000000 +0000
 +++ kmix/tests/CMakeLists.txt
 @@ -21,7 +21,7 @@ kde4_add_executable(profiletest ${profil
      ${kmix_adaptor_SRCS}
diff --git a/multimedia/kdemultimedia4/patches/patch-af b/multimedia/kdemultimedia4/patches/patch-af
index 017b9cb3de6..fe89dfacd6d 100644
--- a/multimedia/kdemultimedia4/patches/patch-af
+++ b/multimedia/kdemultimedia4/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+$NetBSD: patch-af,v 1.2 2012/03/19 20:22:32 markd Exp $
 
---- kioslave/audiocd/plugins/wav/encodercda.cpp.orig	2008-10-31 02:24:16.000000000 +1300
+--- kioslave/audiocd/plugins/wav/encodercda.cpp.orig	2011-01-19 22:23:33.000000000 +0000
 +++ kioslave/audiocd/plugins/wav/encodercda.cpp
 @@ -44,7 +44,7 @@ extern "C"
  {
diff --git a/multimedia/kdemultimedia4/patches/patch-ag b/multimedia/kdemultimedia4/patches/patch-ag
index 4c97971866e..d609857db6b 100644
--- a/multimedia/kdemultimedia4/patches/patch-ag
+++ b/multimedia/kdemultimedia4/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+$NetBSD: patch-ag,v 1.2 2012/03/19 20:22:32 markd Exp $
 
---- kioslave/audiocd/audiocd.cpp.orig	2008-10-31 02:24:17.000000000 +1300
+--- kioslave/audiocd/audiocd.cpp.orig	2011-01-19 22:23:34.000000000 +0000
 +++ kioslave/audiocd/audiocd.cpp
-@@ -29,8 +29,8 @@ extern "C"
+@@ -30,8 +30,8 @@ extern "C"
  {
  	//cdda_interface.h in cdparanoia 10.2 has a member called 'private' which the C++ compiler doesn't like
- 	#define private _private   
+ 	#define private _private
 -	#include <cdda_interface.h>
 -	#include <cdda_paranoia.h>
 +	#include <cdparanoia/cdda_interface.h>
diff --git a/multimedia/kdemultimedia4/patches/patch-ah b/multimedia/kdemultimedia4/patches/patch-ah
index 47d76d33888..fdb1e25ff1e 100644
--- a/multimedia/kdemultimedia4/patches/patch-ah
+++ b/multimedia/kdemultimedia4/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+$NetBSD: patch-ah,v 1.2 2012/03/19 20:22:32 markd Exp $
 
---- kioslave/audiocd/audiocd.upd.orig	2006-10-26 15:29:33.000000000 +1300
+--- kioslave/audiocd/audiocd.upd.orig	2011-01-19 22:23:34.000000000 +0000
 +++ kioslave/audiocd/audiocd.upd
 @@ -1,4 +1,4 @@
  # Update for transport configuration
diff --git a/multimedia/kdemultimedia4/patches/patch-al b/multimedia/kdemultimedia4/patches/patch-al
index 753803f817d..f4bb4507f54 100644
--- a/multimedia/kdemultimedia4/patches/patch-al
+++ b/multimedia/kdemultimedia4/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2009/10/02 20:25:35 markd Exp $
+$NetBSD: patch-al,v 1.2 2012/03/19 20:22:32 markd Exp $
 
---- kioslave/audiocd/CMakeLists.txt.orig	2008-10-18 00:01:46.000000000 +1300
+--- kioslave/audiocd/CMakeLists.txt.orig	2011-01-19 22:23:34.000000000 +0000
 +++ kioslave/audiocd/CMakeLists.txt
-@@ -5,7 +5,7 @@ add_definitions (-DQT3_SUPPORT -DQT3_SUP
+@@ -2,7 +2,7 @@ project(audiocd)
  
  MACRO_PUSH_REQUIRED_VARS()
  SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/include/cdda)