Update to KDE SC 4.11.3

bugfixes, many new features, improved stability and performance.

11 files changed, 5 insertions, 167 deletions

diff --git a/multimedia/kmix/Makefile b/multimedia/kmix/Makefile
index 7c896de89a9..6449849e728 100644
--- a/multimedia/kmix/Makefile
+++ b/multimedia/kmix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/10/10 14:42:25 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2013/11/07 12:49:19 markd Exp $
 
 DISTNAME=	kmix-${_KDE_VERSION}
-PKGREVISION=	6
 CATEGORIES=	multimedia
 COMMENT=	KDE's soundcard mixer program
 
diff --git a/multimedia/kmix/distinfo b/multimedia/kmix/distinfo
index 3f554716a65..16c217a90dd 100644
--- a/multimedia/kmix/distinfo
+++ b/multimedia/kmix/distinfo
@@ -1,16 +1,7 @@
-$NetBSD: distinfo,v 1.5 2013/05/23 15:06:48 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/11/07 12:49:19 markd Exp $
 
-SHA1 (kmix-4.10.3.tar.xz) = 09289c9bb6bd5e592d214f3f665078010e9a7dd2
-RMD160 (kmix-4.10.3.tar.xz) = d77b9dad15c7a9efbaab611c5c6e380c3fa1db07
-Size (kmix-4.10.3.tar.xz) = 385988 bytes
+SHA1 (kmix-4.11.3.tar.xz) = 3d3813f66b034bbe603c0958d41b7b26cfa80e40
+RMD160 (kmix-4.11.3.tar.xz) = 53c8a87fff28dd9dc765d9b5a7e01b7a2706f95d
+Size (kmix-4.11.3.tar.xz) = 387392 bytes
 SHA1 (patch-CMakeLists.txt) = be774815cf3c8ae99f6bae31d5de010f37a6ef29
-SHA1 (patch-apps_kmixd.cpp) = 6a8876778b5b6d3844fcb0c874845eb0b955840b
-SHA1 (patch-backends_mixer__backend.cpp) = 6dea8709aeb26abc8914e35fa5ce05f4296c4b80
-SHA1 (patch-backends_mixer__mpris2.cpp) = ec687666b5e62f5bb41a9308d17a0a62f87dae4a
-SHA1 (patch-core_ControlPool.h) = fba837f300478e015941fa5aa7355372b294bb38
-SHA1 (patch-core_MasterControl.h) = ab348a5ffc440650c9f1fd529335f87e5c81ed12
-SHA1 (patch-core_mixdevice.h) = 75dd0c84517ec0e8fe647a2b8e84370b1e8afea9
-SHA1 (patch-core_mixertoolbox.cpp) = fc3d99aa5b9236c7c4abd7fefa0fcdf0a344829a
-SHA1 (patch-gui_kmixdockwidget.cpp) = 6dfdb8eba6c6682c7678fe936cbb067335908769
-SHA1 (patch-gui_viewdockareapopup.cpp) = 9db09bb68d5aeb2e38e2792264278da0acf4ebff
 SHA1 (patch-tests_CMakeLists.txt) = 4c39d6268e6c690099d06a8ba6946cb90242791e
diff --git a/multimedia/kmix/patches/patch-apps_kmixd.cpp b/multimedia/kmix/patches/patch-apps_kmixd.cpp
deleted file mode 100644
index e4b1f25d8ea..00000000000
--- a/multimedia/kmix/patches/patch-apps_kmixd.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-apps_kmixd.cpp,v 1.3 2013/05/23 15:06:48 joerg Exp $
-
---- apps/kmixd.cpp.orig	2013-05-04 01:50:10.000000000 +0000
-+++ apps/kmixd.cpp
-@@ -156,7 +156,7 @@ void KMixD::saveBaseConfig()
-       config.writeEntry( "MasterMixer", mixerMasterCard->id() );
-    }
-    shared_ptr<MixDevice> mdMaster = Mixer::getGlobalMasterMD();
--   if ( mdMaster != 0 ) {
-+   if ( mdMaster ) {
-       config.writeEntry( "MasterMixerDevice", mdMaster->id() );
-    }
-    QString mixerIgnoreExpression = MixerToolBox::instance()->mixerIgnoreExpression();
diff --git a/multimedia/kmix/patches/patch-backends_mixer__backend.cpp b/multimedia/kmix/patches/patch-backends_mixer__backend.cpp
deleted file mode 100644
index 80d1ed7f686..00000000000
--- a/multimedia/kmix/patches/patch-backends_mixer__backend.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-backends_mixer__backend.cpp,v 1.3 2013/05/23 15:06:48 joerg Exp $
-
---- backends/mixer_backend.cpp.orig	2013-05-04 01:47:44.000000000 +0000
-+++ backends/mixer_backend.cpp
-@@ -237,7 +237,7 @@ void Mixer_Backend::readSetFromHW()
-  */
- shared_ptr<MixDevice> Mixer_Backend::recommendedMaster()
- {
--	if ( m_recommendedMaster != 0 )
-+	if ( m_recommendedMaster )
- 	{
- 		// Backend has set a recommended master. Thats fine. Using it.
- 		return m_recommendedMaster;
diff --git a/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp b/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp
deleted file mode 100644
index f13b590f275..00000000000
--- a/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-backends_mixer__mpris2.cpp,v 1.3 2013/05/23 15:06:48 joerg Exp $
-
---- backends/mixer_mpris2.cpp.orig	2013-05-04 01:48:09.000000000 +0000
-+++ backends/mixer_mpris2.cpp
-@@ -394,7 +394,7 @@ void Mixer_MPRIS2::newMediaPlayer(QStrin
- 			QString id = ( lastDot == -1 ) ? name : name.mid(lastDot+1);
- 			apps.remove(id);
- 			shared_ptr<MixDevice> md = m_mixDevices.get(id);
--			if (md != 0)
-+			if (md)
- 			{
- 				// We know about the player that is unregistering => remove internally
- 				md->close();
diff --git a/multimedia/kmix/patches/patch-core_ControlPool.h b/multimedia/kmix/patches/patch-core_ControlPool.h
deleted file mode 100644
index d6ae865864e..00000000000
--- a/multimedia/kmix/patches/patch-core_ControlPool.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-core_ControlPool.h,v 1.1 2013/05/06 14:54:57 joerg Exp $
-
---- core/ControlPool.h.orig	2013-05-04 01:52:19.000000000 +0000
-+++ core/ControlPool.h
-@@ -25,9 +25,12 @@
- 
- // std::shared_ptr
- #include <memory>
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+using std::shared_ptr;
-+#else
- #include <tr1/memory>
--
- using namespace ::std::tr1;
-+#endif
- 
- #include "core/mixdevice.h"
- 
diff --git a/multimedia/kmix/patches/patch-core_MasterControl.h b/multimedia/kmix/patches/patch-core_MasterControl.h
deleted file mode 100644
index 2df03742f0a..00000000000
--- a/multimedia/kmix/patches/patch-core_MasterControl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-core_MasterControl.h,v 1.1 2013/05/06 14:54:57 joerg Exp $
-
---- core/MasterControl.h.orig	2013-05-04 01:44:08.000000000 +0000
-+++ core/MasterControl.h
-@@ -12,8 +12,12 @@
- 
- // std::shared_ptr
- #include <memory>
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+using std::shared_ptr;
-+#else
- #include <tr1/memory>
- using namespace ::std::tr1;
-+#endif
- 
- class MasterControl
- {
diff --git a/multimedia/kmix/patches/patch-core_mixdevice.h b/multimedia/kmix/patches/patch-core_mixdevice.h
deleted file mode 100644
index e5ebb5dce5e..00000000000
--- a/multimedia/kmix/patches/patch-core_mixdevice.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-core_mixdevice.h,v 1.1 2013/05/06 14:54:57 joerg Exp $
-
---- core/mixdevice.h.orig	2013-05-04 01:42:48.000000000 +0000
-+++ core/mixdevice.h
-@@ -23,8 +23,12 @@
- 
- // std::shared_ptr
- #include <memory>
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+using std::shared_ptr;
-+#else
- #include <tr1/memory>
- using namespace ::std::tr1;
-+#endif
- 
- //KMix
- class Mixer;
diff --git a/multimedia/kmix/patches/patch-core_mixertoolbox.cpp b/multimedia/kmix/patches/patch-core_mixertoolbox.cpp
deleted file mode 100644
index f4858ebffd9..00000000000
--- a/multimedia/kmix/patches/patch-core_mixertoolbox.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-core_mixertoolbox.cpp,v 1.3 2013/05/23 15:06:48 joerg Exp $
-
---- core/mixertoolbox.cpp.orig	2013-05-04 01:52:48.000000000 +0000
-+++ core/mixertoolbox.cpp
-@@ -249,13 +249,13 @@ void MixerToolBox::initMixerInternal(Mul
- 
-    
-     // Add a master device (if we haven't defined one yet)
--   if ( Mixer::getGlobalMasterMD(false) == 0 ) {
-+   if ( !Mixer::getGlobalMasterMD(false) ) {
-       // We have no master card yet. This actually only happens when there was
-       // not one defined in the kmixrc.
-       // So lets just set the first card as master card.
-       if ( Mixer::mixers().count() > 0 ) {
-     	  shared_ptr<MixDevice> master = Mixer::mixers().first()->getLocalMasterMD();
--         if ( master != 0 ) {
-+         if ( master ) {
-              QString controlId = master->id();
-              Mixer::setGlobalMaster( Mixer::mixers().first()->id(), controlId, true);
-          }
diff --git a/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp b/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp
deleted file mode 100644
index 0ad9891a766..00000000000
--- a/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-gui_kmixdockwidget.cpp,v 1.3 2013/05/23 15:06:48 joerg Exp $
-
---- gui/kmixdockwidget.cpp.orig	2013-05-04 01:54:44.000000000 +0000
-+++ gui/kmixdockwidget.cpp
-@@ -217,7 +217,7 @@ void KMixDockWidget::updatePixmap()
- 	shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD();
- 
-     char newPixmapType;
--    if ( md == 0 )
-+    if ( !md )
-     {
-         newPixmapType = 'e';
-     }
-@@ -407,7 +407,7 @@ void KMixDockWidget::contextMenuAboutToS
- void KMixDockWidget::updateDockMuteAction ( KToggleAction* dockMuteAction )
- {  
-     shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD();
--    if ( md != 0 && dockMuteAction != 0 )
-+    if ( md && dockMuteAction != 0 )
-     {
-     	Volume& vol = md->playbackVolume().hasVolume() ? md->playbackVolume() : md->captureVolume();
-     	bool isInactive =  vol.isCapture() ? !md->isRecSource() : md->isMuted();
diff --git a/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp b/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp
deleted file mode 100644
index f3446716f20..00000000000
--- a/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-gui_viewdockareapopup.cpp,v 1.3 2013/05/23 15:06:48 joerg Exp $
-
---- gui/viewdockareapopup.cpp.orig	2013-05-04 01:56:15.000000000 +0000
-+++ gui/viewdockareapopup.cpp
-@@ -244,12 +244,12 @@ Application: KMix (kmix), signal: Segmen
- 	{
- 		kDebug() << "ADD? mixerId=" << mixer->id();
- 		shared_ptr<MixDevice>dockMD = mixer->getLocalMasterMD();
--		if ( dockMD == 0 && mixer->size() > 0 )
-+		if ( !dockMD && mixer->size() > 0 )
- 		{
- 			// If we have no dock device yet, we will take the first available mixer device.
- 			dockMD = (*mixer)[0];
- 		}
--		if ( dockMD != 0 )
-+		if ( dockMD )
- 		{
- 			kDebug() << "ADD? mixerId=" << mixer->id() << ", md=" << dockMD->id();
- 			if ( !dockMD->isApplicationStream() && dockMD->playbackVolume().hasVolume())