LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File 4_6_BRANCH.diff of Package kdebase4-workspace (Project openSUSE:11.4)

package: kdebase-workspace-4.5.85.tar.bz2
kdemod: kdebase/workspace
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
+current HEAD: 1204116
+svn di between //trunk/KDE/kdebase/workspace@1149349 and //trunk/KDE/kdebase/workspace
--- startkde.cmake.orig	2011-01-26 15:21:14.856499000 +0100
+++ startkde.cmake	2011-01-26 15:21:24.559585000 +0100
@@ -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