Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdebase-startkde/files: 4.6.0-startkde.patch
Date: Thu, 27 Jan 2011 00:02:41
Message-Id: 20110127000231.D567120057@flycatcher.gentoo.org
1 scarabeus 11/01/27 00:02:31
2
3 Added: 4.6.0-startkde.patch
4 Log:
5 Revision bump to fix malloc issue. (force - unsynced tree)
6
7 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64, RepoMan options: --force)
8
9 Revision Changes Path
10 1.1 kde-base/kdebase-startkde/files/4.6.0-startkde.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebase-startkde/files/4.6.0-startkde.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdebase-startkde/files/4.6.0-startkde.patch?rev=1.1&content-type=text/plain
14
15 Index: 4.6.0-startkde.patch
16 ===================================================================
17 Index: branches/KDE/4.6/kdebase/workspace/startkde.cmake
18 ===================================================================
19 --- startkde.cmake.old (revision 1217283)
20 +++ startkde.cmake (revision 1217284)
21 @@ -36,18 +36,6 @@
22 # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
23 unset DYLD_FORCE_FLAT_NAMESPACE
24
25 -# Enable lightweight memory corruption checker if not already set
26 -# -- this is for trunk only, we remove it for releases
27 -if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
28 - # Extract the first two components of the version from the output.
29 - 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')
30 -
31 - MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
32 - test $glibc_version \> 2.08 && MALLOC_CHECK_=3
33 -
34 - export MALLOC_CHECK_
35 -fi
36 -
37 # in case we have been started with full pathname spec without being in PATH
38 bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
39 if [ -n "$bindir" ]; then