[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD malloc_check.patch)

[Ronald van Haren]

    Date: Wednesday, August 11, 2010 @ 16:44:36
  Author: ronald
Revision: 87286

upgpkg: kdebase-workspace 4.5.0-2
disable malloc_check in startkde script

Added:
  kdebase-workspace/trunk/malloc_check.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   10 +++++++---
 malloc_check.patch |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-11 20:44:19 UTC (rev 87285)
+++ PKGBUILD	2010-08-11 20:44:36 UTC (rev 87286)
@@ -4,7 +4,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -27,7 +27,7 @@
         'etc/pam.d/kscreensaver')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
-        'fixpath.patch' 'terminate-server.patch')
+        'fixpath.patch' 'terminate-server.patch' 'malloc_check.patch')
 sha1sums=('86648def4f6c1791ed385b649b867d9a38db6e1c'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -35,7 +35,8 @@
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'bfd907a124705e72d01cec1afb613e2565cd0c44')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -43,6 +44,9 @@
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
 
+        # remove MALLOC_CHECK from startkde script
+        patch -Np0 -i ${srcdir}/malloc_check.patch
+
 	cd ${srcdir}
 	mkdir build
 	cd build

Added: malloc_check.patch
===================================================================
--- malloc_check.patch	                        (rev 0)
+++ malloc_check.patch	2010-08-11 20:44:36 UTC (rev 87286)
@@ -0,0 +1,21 @@
+--- startkde.cmake.old	2010-08-11 19:45:21.546666823 +0200
++++ startkde.cmake	2010-08-11 19:45:34.563333482 +0200
+@@ -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
+-
+ # Boot sequence:
+ #
+ # kdeinit is used to fork off processes which improves memory usage