From 1eaab7d292036b01fd0281fb5eef9a83ae4c68a8 Mon Sep 17 00:00:00 2001
From: Phil Miller <philm@chakra-project.org>
Date: Sat, 28 Aug 2010 00:22:58 +0200
Subject: [PATCH] fix kdeworkspace

---
 kdebase-workspace/PKGBUILD           | 10 ++--------
 kdebase-workspace/malloc_check.patch | 21 ---------------------
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 kdebase-workspace/malloc_check.patch

diff --git a/kdebase-workspace/PKGBUILD b/kdebase-workspace/PKGBUILD
index 42506da7d..2e1e3b7ef 100644
--- a/kdebase-workspace/PKGBUILD
+++ b/kdebase-workspace/PKGBUILD
@@ -92,8 +92,7 @@ source=($_mirror/${_origname}-$_kdever.tar.bz2
 
 #	feature_kdm-plymouth.patch
 
-	screensaver-sleep.patch
-	malloc_check.patch)
+	screensaver-sleep.patch)
 
 md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
         'f355a658d2e9267fdf4e8d8f88038bcf' # mishaaq-kcm_touchpad-00370b5.tar.gz
@@ -126,8 +125,7 @@ md5sums=(`grep ${_origname}-$_kdever.tar.bz2 ../kde-sc.md5 | cut -d" " -f1`
 #        '894815a80f99a9a0dee1adbcda49b161' #  feature_battery-tooltip.patch
 #        '9b97ac1b4deb8d0c8ca7afffb80b4320' #  feature_history-notifications-enable-disable-kde#119207.patch
 #        '42b3b5e09372c57910c3435e63e2dfd6' #  feature_kdm-plymouth.patch
-        'bf36e9cc623c7c3da6668e560e29975c'  #  screensaver-sleep.patch
-        '3d10907980fe73ebbb3e323c69ade74a') #  malloc_check.patch
+        'bf36e9cc623c7c3da6668e560e29975c') #  screensaver-sleep.patch
 
 
 #
@@ -178,10 +176,6 @@ build()
 
 	msg "applying arch patches ..."
         patch -p1 -i ${srcdir}/screensaver-sleep.patch || return 1 # FS#19426  
-        # remove MALLOC_CHECK from startkde script
-        patch -Np0 -i ${srcdir}/malloc_check.patch
-
-
 
 	msg "starting workspace build ..."
 	cmake . -DCMAKE_BUILD_TYPE=${_build_type} \
diff --git a/kdebase-workspace/malloc_check.patch b/kdebase-workspace/malloc_check.patch
deleted file mode 100644
index 72b429d1f..000000000
--- a/kdebase-workspace/malloc_check.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- startkde.cmake.old	2010-08-11 19:45:21.546666823 +0200
-+++ startkde.cmake	2010-08-11 19:45:34.563333482 +0200
-@@ -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
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage