[kde-workspace/f19: 25/28] Revert "drop the rejected KMix memory leak workaround"

[Rex Dieter]

commit 7e5c764932660638be1fcce50369558aeaa553b3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 08:16:08 2013 -0500

    Revert "drop the rejected KMix memory leak workaround"
    
    This reverts commit 0d806fe2d9bb8495e64582262407a93242badf6f.

 kde-workspace-4.10.4-kmix_oxygen_memleak.patch |   12 ++++++++++++
 kde-workspace.spec                             |   11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/kde-workspace-4.10.4-kmix_oxygen_memleak.patch b/kde-workspace-4.10.4-kmix_oxygen_memleak.patch
new file mode 100644
index 0000000..d21726d
--- /dev/null
+++ b/kde-workspace-4.10.4-kmix_oxygen_memleak.patch
@@ -0,0 +1,12 @@
+diff -up kde-workspace-4.10.4/kstyles/oxygen/animations/oxygendatamap.h.kmix_leak kde-workspace-4.10.4/kstyles/oxygen/animations/oxygendatamap.h
+--- kde-workspace-4.10.4/kstyles/oxygen/animations/oxygendatamap.h.kmix_leak	2013-05-28 13:38:21.000000000 -0500
++++ kde-workspace-4.10.4/kstyles/oxygen/animations/oxygendatamap.h	2013-06-26 14:51:44.213319108 -0500
+@@ -100,7 +100,7 @@ namespace Oxygen
+             if( iter == QMap<Key, Value>::end() ) return false;
+ 
+             // delete value from map if found
+-            if( iter.value() ) iter.value().data()->deleteLater();
++            if( iter.value() ) delete iter.value().data();
+             QMap<Key, Value>::erase( iter );
+ 
+             return true;
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 3d0d3eb..f9f2476 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -17,7 +17,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.10.5
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -108,6 +108,11 @@ Patch54: kde-workspace-kcm_fonts_dont_change_on_load.patch
 # support BUILD_KCM_RANDR (default ON) option
 Patch55: kde-workspace-4.10.2-BUILD_KCM_RANDR.patch
 
+# oxygen animiations memleak (exposed easily by kmix+pulseaudio)
+# https://bugs.kde.org/309464
+# https://bugzilla.redhat.com/912457
+Patch56: kde-workspace-4.10.4-kmix_oxygen_memleak.patch
+
 # pam/systemd bogosity: kdm restart/shutdown does not work 
 # http://bugzilla.redhat.com/796969
 Patch57: kde-workspace-4.8.0-bug796969.patch
@@ -467,6 +472,7 @@ Requires: akonadi
 %patch53 -p1 -b .kdm_xauth
 %patch54 -p1 -b .kcm_fonts_dont_change_on_load
 %patch55 -p1 -b .BUILD_KCM_RANDR
+%patch56 -p1 -b .kmix_oxygen_memleak
 %patch57 -p1 -b .bug796969
 %patch62 -p1 -b .systemd-displaymanager
 
@@ -1025,9 +1031,6 @@ fi
 
 
 %changelog
-* Tue Jul 02 2013 Than Ngo <than at redhat.com> - 4.10.5-2
-- drop the rejected KMix memory leak workaround
-
 * Sun Jun 30 2013 Than Ngo <than at redhat.com> - 4.10.5-1
 - 4.10.5