Update to KDE SC 4.14.3

4 files changed, 22 insertions, 20 deletions

diff --git a/multimedia/kmix/Makefile b/multimedia/kmix/Makefile
index 3ecdb7d59bc..8175f7749e1 100644
--- a/multimedia/kmix/Makefile
+++ b/multimedia/kmix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2014/11/07 19:39:39 adam Exp $
+# $NetBSD: Makefile,v 1.24 2014/11/13 12:06:45 markd Exp $
 
 DISTNAME=	kmix-${_KDE_VERSION}
-PKGREVISION=	9
 CATEGORIES=	multimedia
 COMMENT=	KDE's soundcard mixer program
 
diff --git a/multimedia/kmix/PLIST b/multimedia/kmix/PLIST
index 09082117c31..85a595e4546 100644
--- a/multimedia/kmix/PLIST
+++ b/multimedia/kmix/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/03 11:13:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/11/13 12:06:45 markd Exp $
 bin/kmix
 bin/kmixctrl
+bin/kmixremote
 lib/kde4/kded_kmixd.so
 lib/kde4/plasma_engine_mixer.so
 lib/libkdeinit4_kmix.so
@@ -12,7 +13,9 @@ 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-configure-general.png
+share/doc/kde/HTML/en/kmix/kmix-configure-sound-menu.png
+share/doc/kde/HTML/en/kmix/kmix-configure-start.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
diff --git a/multimedia/kmix/distinfo b/multimedia/kmix/distinfo
index 39753e1edab..2e3e94f05f1 100644
--- a/multimedia/kmix/distinfo
+++ b/multimedia/kmix/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2014/02/01 02:20:51 markd Exp $
+$NetBSD: distinfo,v 1.8 2014/11/13 12:06:45 markd Exp $
 
-SHA1 (kmix-4.11.5.tar.xz) = ade4aa2112a2c1cb815c1168e0f865f634b5e4f2
-RMD160 (kmix-4.11.5.tar.xz) = 7a3db968490ec3db1d92ec8f6749190274da8aba
-Size (kmix-4.11.5.tar.xz) = 381828 bytes
-SHA1 (patch-CMakeLists.txt) = be774815cf3c8ae99f6bae31d5de010f37a6ef29
+SHA1 (kmix-4.14.3.tar.xz) = 556d49a0d54f5908ab5ffaacfe821e2ec3047b81
+RMD160 (kmix-4.14.3.tar.xz) = 217854ce2004ccf70e0c76b99095a9b4abb96d24
+Size (kmix-4.14.3.tar.xz) = 379220 bytes
+SHA1 (patch-CMakeLists.txt) = 94d47c2e106f5073b1474ba1ed3ebe8018943063
 SHA1 (patch-tests_CMakeLists.txt) = 4c39d6268e6c690099d06a8ba6946cb90242791e
diff --git a/multimedia/kmix/patches/patch-CMakeLists.txt b/multimedia/kmix/patches/patch-CMakeLists.txt
index c6afd7e4b11..8c082e6244d 100644
--- a/multimedia/kmix/patches/patch-CMakeLists.txt
+++ b/multimedia/kmix/patches/patch-CMakeLists.txt
@@ -1,33 +1,33 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/03 11:13:10 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2014/11/13 12:06:45 markd Exp $
 
 Add $ENV{LIBOSSAUDIO}
 
---- CMakeLists.txt.orig	2013-03-01 07:07:55.000000000 +0000
+--- CMakeLists.txt.orig	2014-07-16 08:24:17.000000000 +0000
 +++ CMakeLists.txt
-@@ -114,7 +114,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
+@@ -132,7 +132,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_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
++target_link_libraries(kdeinit_kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS} $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_
+@@ -174,7 +174,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})
+-target_link_libraries(kded_kmixd ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
++target_link_libraries(kded_kmixd ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS} $ENV{LIBOSSAUDIO})
  
  if (HAVE_LIBASOUND2)
      target_link_libraries(kded_kmixd ${ASOUND_LIBRARY})
-@@ -199,7 +199,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
+@@ -217,7 +217,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})
+-target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
++target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS} $ENV{LIBOSSAUDIO})
  
  if (HAVE_LIBASOUND2)
      target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})