rpms/kdebase-workspace/devel kdebase-workspace-4.3.85-no_malloc_check.patch, NONE, 1.1 kdebase-workspace.spec, 1.333, 1.334

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11084

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.85-no_malloc_check.patch 
Log Message:
* Sat Jan 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
- startkde: disable MALLOC_CHECK_


kdebase-workspace-4.3.85-no_malloc_check.patch:
 startkde.cmake |   16 ----------------
 1 file changed, 16 deletions(-)

--- NEW FILE kdebase-workspace-4.3.85-no_malloc_check.patch ---
diff -up kdebase-workspace-4.3.85/startkde.cmake.no_malloc_check kdebase-workspace-4.3.85/startkde.cmake
--- kdebase-workspace-4.3.85/startkde.cmake.no_malloc_check	2009-12-27 04:41:34.850054083 -0600
+++ kdebase-workspace-4.3.85/startkde.cmake	2010-01-02 23:21:57.248464093 -0600
@@ -36,22 +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 | head -1 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/')
-
-    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
-
-    # POSIX test or sh can't do the string compare, use perl
-    # The s/// is to make 2.d$ --> 2.0d$ for sorting.
-    ver_script='$vers = $ARGV[0]; $vers =~ s/\.([0-9])$/.0$1/; if ("${vers}" ge "2.09") { exit 0; } exit 1;'
-    perl -e "$ver_script" $glibc_version >/dev/null 2>&1 && MALLOC_CHECK_=3
-
-    export MALLOC_CHECK_
-fi
-
 # Boot sequence:
 #
 # kdeinit is used to fork off processes which improves memory usage


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -p -r1.333 -r1.334
--- kdebase-workspace.spec	27 Dec 2009 10:47:51 -0000	1.333
+++ kdebase-workspace.spec	3 Jan 2010 05:25:25 -0000	1.334
@@ -10,7 +10,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.3.85
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -40,6 +40,7 @@ Patch16: kdebase-workspace-4.3.75-batter
 Patch17: kdebase-workspace-4.3.75-classicmenu-logout.patch
 Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
+Patch21: kdebase-workspace-4.3.85-no_malloc_check.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -276,6 +277,7 @@ Requires: akonadi
 %patch17 -p1 -b .classicmenu-logout
 %patch19 -p1 -b .kdm_plymouth
 %patch20 -p1 -b .xsession_errors_O_APPEND
+%patch21 -p1 -b .no_malloc_check
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -632,6 +634,9 @@ fi
 
 
 %changelog
+* Sat Jan 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-2
+- startkde: disable MALLOC_CHECK_
+
 * Fri Dec 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.85-1
 - kde-4.3.85 (4.4beta2)