[arch-commits] Commit in kdemultimedia/trunk (PKGBUILD fix-memleak-in-kmix.patch)

[Andrea Scarpino]

    Date: Tuesday, July 26, 2011 @ 09:58:32
  Author: andrea
Revision: 132843

patch is already merged

Modified:
  kdemultimedia/trunk/PKGBUILD
Deleted:
  kdemultimedia/trunk/fix-memleak-in-kmix.patch

---------------------------+
 PKGBUILD                  |    9 +------
 fix-memleak-in-kmix.patch |   55 --------------------------------------------
 2 files changed, 2 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-26 13:33:50 UTC (rev 132842)
+++ PKGBUILD	2011-07-26 13:58:32 UTC (rev 132843)
@@ -19,16 +19,11 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
             'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config'
-        'fix-memleak-in-kmix.patch')
+        'mplayerthumbs.config')
 sha1sums=('3ad5f6e806a0e8ea9f7c88697d6f605a112a9d21'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '80370de30898f1ba1a6db057d34324abdcc57384')
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683')
 
 build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch
-
     cd ${srcdir}
 	mkdir build
 	cd build

Deleted: fix-memleak-in-kmix.patch
===================================================================
--- fix-memleak-in-kmix.patch	2011-07-26 13:33:50 UTC (rev 132842)
+++ fix-memleak-in-kmix.patch	2011-07-26 13:58:32 UTC (rev 132843)
@@ -1,55 +0,0 @@
-Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
-===================================================================
---- kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241345)
-+++ kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241346)
-@@ -754,7 +754,12 @@
-         return;
-     }
-     addDevice((*map)[index]);
--    emit controlsReconfigured(_mixer->id());
-+    // Do not emit directly to ensure all connected slots are executed
-+    // in their own event loop.
-+    QMetaObject::invokeMethod(this,
-+                              "controlsReconfigured",
-+                              Qt::QueuedConnection,
-+                              Q_ARG(QString, _mixer->id()));
- }
- 
- void Mixer_PULSE::removeWidget(int index)
-@@ -778,7 +783,12 @@
-         {
-             delete *iter;
-             m_mixDevices.erase(iter);
--            emit controlsReconfigured(_mixer->id());
-+            // Do not emit directly to ensure all connected slots are executed
-+            // in their own event loop.
-+            QMetaObject::invokeMethod(this,
-+                                      "controlsReconfigured",
-+                                      Qt::QueuedConnection,
-+                                      Q_ARG(QString, _mixer->id()));
-             return;
-         }
-     }
-@@ -799,7 +809,12 @@
-         delete *iter;
-         m_mixDevices.erase(iter);
-     }
--    emit controlsReconfigured(_mixer->id());
-+    // Do not emit directly to ensure all connected slots are executed
-+    // in their own event loop.
-+    QMetaObject::invokeMethod(this,
-+                              "controlsReconfigured",
-+                              Qt::QueuedConnection,
-+                              Q_ARG(QString, _mixer->id()));
- }
- 
- void Mixer_PULSE::addDevice(devinfo& dev)
-@@ -990,7 +1005,7 @@
-         kDebug(67100) <<  "Using PulseAudio for mixer: " << m_mixerName;
-         m_isOpen = true;
-     }
-- 
-+
-     return 0;
- }
-