[kdebase-workspace] cleanup/remove some old/deprecated pieces

[Rex Dieter]

commit 5ee0f85de4f7315d66ef111de2eb85e6aea246bd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jul 5 14:32:42 2011 -0500

    cleanup/remove some old/deprecated pieces

 kdebase-workspace-4.6.90-no_malloc_check.patch |   22 ++++++++++++++++++++++
 kdebase-workspace.spec                         |    8 ++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/kdebase-workspace-4.6.90-no_malloc_check.patch b/kdebase-workspace-4.6.90-no_malloc_check.patch
new file mode 100644
index 0000000..306edb3
--- /dev/null
+++ b/kdebase-workspace-4.6.90-no_malloc_check.patch
@@ -0,0 +1,22 @@
+diff -up kdebase-workspace-4.6.90/startkde.cmake.no_mallocdebug kdebase-workspace-4.6.90/startkde.cmake
+--- kdebase-workspace-4.6.90/startkde.cmake.no_mallocdebug	2011-07-05 14:29:35.582349022 -0500
++++ kdebase-workspace-4.6.90/startkde.cmake	2011-07-05 14:30:26.521712192 -0500
+@@ -44,18 +44,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 7e5bee8..b8dddf4 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.90
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version %{version} 
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -69,6 +69,9 @@ Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.6.80-kde#171685.patch
 
+## upstream patches
+Patch100: kdebase-workspace-4.6.90-no_malloc_check.patch
+
 ## Fedora specific patches
 ## HAL-ectomy
 Patch200: kdebase-workspace-4.5.85-no_HAL.patch
@@ -313,7 +316,8 @@ pushd %{name}-%{version}
 # upstreamable patches
 %patch50 -p1 -b .kde#171685
 
-# trunk patches
+# upstream patches
+%patch100 -p1 -b .no_malloc_check
 
 # Fedora patches
 %patch200 -p0 -b .no_HAL