[kdebase-workspace] disable malloc checking in startkde for releases

[Lukas Tinkl]

commit 449c18a1cc4402267a7e9e72bad1dca15faf7a70
Author: Lukas Tinkl <lukas at kde.org>
Date:   Thu Aug 12 14:41:52 2010 +0200

    disable malloc checking in startkde for releases

 kdebase-workspace-4.5.0-startkde-malloc.patch |   36 +++++++++++++++++++++++++
 kdebase-workspace.spec                        |    7 ++++-
 2 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.5.0-startkde-malloc.patch b/kdebase-workspace-4.5.0-startkde-malloc.patch
new file mode 100644
index 0000000..d97ddf7
--- /dev/null
+++ b/kdebase-workspace-4.5.0-startkde-malloc.patch
@@ -0,0 +1,36 @@
+--- startkde.cmake	2010/08/12 11:40:19	1162652
++++ startkde.cmake	2010/08/12 11:41:53	1162653
+@@ -36,18 +36,6 @@
+ # 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
+-
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
+@@ -405,11 +393,11 @@
+ # if KDEWM is not set, ksmserver will ensure kwin is started.
+ # kwrapper4 is used to reduce startup time and memory usage
+ # kwrapper4 does not return useful error codes such as the exit code of ksmserver.
+-# We only check for 255 which means that the ksmserver process could not be 
+-# started, any problems thereafter, e.g. ksmserver failing to initialize, 
++# We only check for 255 which means that the ksmserver process could not be
++# started, any problems thereafter, e.g. ksmserver failing to initialize,
+ # will remain undetected.
+ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+-kwrapper4 ksmserver $KDEWM 
++kwrapper4 ksmserver $KDEWM
+ if test $? -eq 255; then
+   # Startup error
+   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 4864438..8b31552 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -17,7 +17,7 @@ Version: 4.5.0
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version 4.5.00
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -68,6 +68,7 @@ Patch52: kdebase-workspace-4.4.85-kdebug238325.patch
 Patch53: kdebase-workspace-4.4.4-kdebug183143.patch
 
 ## 4.5 patches
+Patch100: kdebase-workspace-4.5.0-startkde-malloc.patch
 
 ## trunk patches
 
@@ -319,6 +320,7 @@ Requires: akonadi
 %patch53 -p1 -b .kdebug183143
 
 # 4.5 patches
+%patch100 -p0 -b .startkde-malloc
 
 # trunk patches
 
@@ -693,6 +695,9 @@ fi
 
 
 %changelog
+* Thu Aug 12 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.5.0-2
+- disable malloc checking in startkde for releases
+
 * Tue Aug 03 2010 Than Ngo <than at redhat.com> - 4.5.0-1
 - 4.5.0
 - kde4workspace_version