Update to KDE SC 4.10.2

bugfixes, other quality improvements, new and improved KDE Applications

7 files changed, 152 insertions, 0 deletions

diff --git a/multimedia/kmix/DESCR b/multimedia/kmix/DESCR
new file mode 100644
index 00000000000..5d63f2fc219
--- /dev/null
+++ b/multimedia/kmix/DESCR
@@ -0,0 +1,6 @@
+kmix is KDE's soundcard mixer program. Though small, it is
+full-featured. The program should give controls for each of your
+soundcards.
+
+kmix supports several platforms and sound drivers.
+
diff --git a/multimedia/kmix/Makefile b/multimedia/kmix/Makefile
new file mode 100644
index 00000000000..d2f1f4a514d
--- /dev/null
+++ b/multimedia/kmix/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2013/04/03 11:13:09 markd Exp $
+
+DISTNAME=	kmix-${_KDE_VERSION}
+CATEGORIES=	multimedia
+COMMENT=	KDE's soundcard mixer program
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kmix/PLIST b/multimedia/kmix/PLIST
new file mode 100644
index 00000000000..09082117c31
--- /dev/null
+++ b/multimedia/kmix/PLIST
@@ -0,0 +1,54 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/03 11:13:09 markd Exp $
+bin/kmix
+bin/kmixctrl
+lib/kde4/kded_kmixd.so
+lib/kde4/plasma_engine_mixer.so
+lib/libkdeinit4_kmix.so
+lib/libkdeinit4_kmixctrl.so
+share/applications/kde4/kmix.desktop
+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/doc/kde/HTML/en/kmix/common
+share/doc/kde/HTML/en/kmix/index.cache.bz2
+share/doc/kde/HTML/en/kmix/index.docbook
+share/doc/kde/HTML/en/kmix/kmix-configure.png
+share/doc/kde/HTML/en/kmix/kmix-file.png
+share/doc/kde/HTML/en/kmix/kmix-master.png
+share/doc/kde/HTML/en/kmix/kmix-options.png
+share/doc/kde/HTML/en/kmix/kmix.png
+share/icons/hicolor/128x128/apps/kmix.png
+share/icons/hicolor/16x16/apps/kmix.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/hicolor/64x64/apps/kmix.png
+share/kde/apps/kmix/kmixui.rc
+share/kde/apps/kmix/pics/kmixdocked.png
+share/kde/apps/kmix/pics/kmixdocked_error.png
+share/kde/apps/kmix/pics/kmixdocked_mute.png
+share/kde/apps/kmix/pics/mixer-ac97.png
+share/kde/apps/kmix/pics/mixer-capture.png
+share/kde/apps/kmix/pics/mixer-cd.png
+share/kde/apps/kmix/pics/mixer-digital.png
+share/kde/apps/kmix/pics/mixer-front.png
+share/kde/apps/kmix/pics/mixer-headset.png
+share/kde/apps/kmix/pics/mixer-lfe.png
+share/kde/apps/kmix/pics/mixer-line.png
+share/kde/apps/kmix/pics/mixer-master.png
+share/kde/apps/kmix/pics/mixer-microphone.png
+share/kde/apps/kmix/pics/mixer-midi.png
+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/plasma/services/mixer.operations
+share/kde/autostart/kmix_autostart.desktop
+share/kde/autostart/restore_kmix_volumes.desktop
+share/kde4/services/kded/kmixd.desktop
+share/kde4/services/kmixctrl_restore.desktop
+share/kde4/services/plasma-engine-mixer.desktop
diff --git a/multimedia/kmix/distinfo b/multimedia/kmix/distinfo
new file mode 100644
index 00000000000..85203ad2b68
--- /dev/null
+++ b/multimedia/kmix/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2013/04/03 11:13:10 markd Exp $
+
+SHA1 (kmix-4.10.2.tar.xz) = 26617eeac172e3375cd097c8350ebdb32412e9fa
+RMD160 (kmix-4.10.2.tar.xz) = a09bcba9375863b42cd415a7e9ece2f60b4cb425
+Size (kmix-4.10.2.tar.xz) = 385736 bytes
+SHA1 (patch-CMakeLists.txt) = be774815cf3c8ae99f6bae31d5de010f37a6ef29
+SHA1 (patch-tests_CMakeLists.txt) = 4c39d6268e6c690099d06a8ba6946cb90242791e
diff --git a/multimedia/kmix/options.mk b/multimedia/kmix/options.mk
new file mode 100644
index 00000000000..350fa44998e
--- /dev/null
+++ b/multimedia/kmix/options.mk
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2013/04/03 11:13:10 markd Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.kmix
+PKG_SUPPORTED_OPTIONS=	pulseaudio alsa
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpulseaudio)
+.include "../../audio/pulseaudio/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWITH_PulseAudio:BOOL=OFF
+.endif
+
+.if !empty(PKG_OPTIONS:Malsa)
+.include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CMAKE_ARGS+=	-DWITH_ALSA:BOOL=OFF
+.endif
diff --git a/multimedia/kmix/patches/patch-CMakeLists.txt b/multimedia/kmix/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..c6afd7e4b11
--- /dev/null
+++ b/multimedia/kmix/patches/patch-CMakeLists.txt
@@ -0,0 +1,33 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/03 11:13:10 markd Exp $
+
+Add $ENV{LIBOSSAUDIO}
+
+--- CMakeLists.txt.orig	2013-03-01 07:07:55.000000000 +0000
++++ CMakeLists.txt
+@@ -114,7 +114,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
+ 
+ kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
+ 
+-target_link_libraries(kdeinit_kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(kdeinit_kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+ #target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} /home/kde/workspace/kdelibs/build/lib/libsolid.so.4.7.0 ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
+ 
+ if (HAVE_LIBASOUND2)
+@@ -157,7 +157,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(kded_kmixd ${ASOUND_LIBRARY})
+@@ -199,7 +199,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
+ 
+ kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})
+ 
+-target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY})
++target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+ 
+ if (HAVE_LIBASOUND2)
+     target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})
diff --git a/multimedia/kmix/patches/patch-tests_CMakeLists.txt b/multimedia/kmix/patches/patch-tests_CMakeLists.txt
new file mode 100644
index 00000000000..3aeaf4f0a3a
--- /dev/null
+++ b/multimedia/kmix/patches/patch-tests_CMakeLists.txt
@@ -0,0 +1,13 @@
+$NetBSD: patch-tests_CMakeLists.txt,v 1.1 2013/04/03 11:13:10 markd Exp $
+
+--- tests/CMakeLists.txt.orig	2011-01-19 22:23:29.000000000 +0000
++++ tests/CMakeLists.txt
+@@ -21,7 +21,7 @@ kde4_add_executable(profiletest ${profil
+     ${kmix_adaptor_SRCS}
+     )
+ 
+-target_link_libraries(profiletest  ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} )
++target_link_libraries(profiletest  ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
+ 
+ if (HAVE_LIBASOUND2)
+     target_link_libraries(profiletest ${ASOUND_LIBRARY})