[gentoo-commits] proj/kde:master commit in: kde-base/kdebase-startkde/, kde-base/kdebase-startkde/files/

[Marc Schiffbauer]

commit:     b172b02e599f3ee8fad05f4c93d32889ae1ec41c
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  5 13:07:38 2011 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Tue Jul  5 13:07:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b172b02e

[kde-base/kdebase-startkde] Do not set MALLOC_CHECK_. Fixes bug #374077. Thx to Nikos Chantziaras

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key 0x35A64134)

---
 .../kdebase-startkde_do_not_set_MALLOC_CHECK.patch |   21 ++++++++++++++++++++
 .../kdebase-startkde-4.6.90.ebuild                 |    5 +++-
 2 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch b/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
new file mode 100644
index 0000000..8c62f8c
--- /dev/null
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde_do_not_set_MALLOC_CHECK.patch
@@ -0,0 +1,21 @@
+--- a/startkde.cmake
++++ b/startkde.cmake
+@@ -36,18 +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 | 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

diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild
index 14f6fa9..7bf3eb4 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.6.90.ebuild
@@ -45,7 +45,10 @@ KMEXTRACTONLY="
 	startkde.cmake
 "
 
-PATCHES=("${FILESDIR}/gentoo-startkde4-4.patch")
+PATCHES=(
+	"${FILESDIR}/gentoo-startkde4-4.patch"
+	"${FILESDIR}/kdebase-startkde_do_not_set_MALLOC_CHECK.patch"
+)
 
 src_prepare() {
 	kde4-meta_src_prepare