[kdebase-workspace] startkde: omit MALLOC_CHECK_ debug'ery

[Rex Dieter]

commit 9758d4007959fe949d58e0da71bbbddc3529daed
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Dec 29 17:56:45 2011 -0600

    startkde: omit MALLOC_CHECK_ debug'ery

 kde-workspace-4.7.95-no_malloc_check.patch |   22 ++++++++++++++++++++++
 kdebase-workspace.spec                     |    8 +++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.7.95-no_malloc_check.patch b/kde-workspace-4.7.95-no_malloc_check.patch
new file mode 100644
index 0000000..6b3426b
--- /dev/null
+++ b/kde-workspace-4.7.95-no_malloc_check.patch
@@ -0,0 +1,22 @@
+diff -up kde-workspace-4.7.95/startkde.cmake.no_malloc_check kde-workspace-4.7.95/startkde.cmake
+--- kde-workspace-4.7.95/startkde.cmake.no_malloc_check	2011-12-29 17:54:24.634643588 -0600
++++ kde-workspace-4.7.95/startkde.cmake	2011-12-29 17:54:50.460320722 -0600
+@@ -36,18 +36,6 @@ fi
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# Enable lightweight memory corruption checker if not already set
+-# -- this is for trunk only, we remove it for releases
+-if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
+-    # Extract the first two components of the version from the output.
+-    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
+-
+-    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
+-    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
+-
+-    export MALLOC_CHECK_
+-fi
+-
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 5afcf6e..0691ba7 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -76,6 +76,8 @@ Patch50: kde-workspace-4.7.80-kde#171685.patch
 Patch52: kde-workspace-4.7.80-bz#732830-login.patch
 
 ## upstream patches
+# omit MALLOC_CHECK_ from startkde
+Patch100: kde-workspace-4.7.95-no_malloc_check.patch
 
 ## plasma active patches
 # adapted version of wac-html-widgets.patch
@@ -388,6 +390,7 @@ Requires: akonadi
 %patch52 -p1 -b .bz#732830-login
 
 # upstream patches
+%patch100 -p1 -b .no_malloc_check
 
 # plasma-active
 %patch153 -p1 -b .wac-html-widgets
@@ -909,6 +912,9 @@ fi
 
 
 %changelog
+* Thu Dec 29 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-2
+- startkde: omit MALLOC_CHECK_ debug'ery
+
 * Wed Dec 21 2011 Radek Novacek <rnovacek at redhat.com> 4.7.95-1
 - 4.7.95
 - Add Ariya kdm theme