[arch-commits] Commit in kdebase-workspace/kde-unstable (2 files)

[Andrea Scarpino]

    Date: Wednesday, January 26, 2011 @ 13:59:44
  Author: andrea
Revision: 107554

Add fix MALLOC CHECK patch

Added:
  kdebase-workspace/kde-unstable/fix-MALLOC_CHECK.patch
Modified:
  kdebase-workspace/kde-unstable/PKGBUILD

------------------------+
 PKGBUILD               |   11 +++++++----
 fix-MALLOC_CHECK.patch |   23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-26 18:55:14 UTC (rev 107553)
+++ PKGBUILD	2011-01-26 18:59:44 UTC (rev 107554)
@@ -27,16 +27,18 @@
 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'
-        'set-horos-theme.patch')
-sha1sums=('ec010d2b1c3b584b30a76b792d58f4a0f15f322a'
+        'set-horos-theme.patch'
+        'fix-MALLOC_CHECK.patch')
+sha1sums=('c192f712d16617e625acc84fcd9e0546df887a70'
           '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
           '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
           'f7b38af38549242a240f1a90ab9964ca8a366129'
           '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
-          'c192f712d16617e625acc84fcd9e0546df887a70'
-          'd1f74ba2c7e2580d32b16ab88b0e6e804951e663')
+          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+          'd1f74ba2c7e2580d32b16ab88b0e6e804951e663'
+          'd8d6ac7f1b25a30fdd0d6a182e2ac6c6f2a28cd7')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -46,6 +48,7 @@
 
     # Already fixed upstream
     patch -Np0 -i ${srcdir}/set-horos-theme.patch
+    patch -Np0 -i ${srcdir}/fix-MALLOC_CHECK.patch
 
 	cd ${srcdir}
 	mkdir build

Added: fix-MALLOC_CHECK.patch
===================================================================
--- fix-MALLOC_CHECK.patch	                        (rev 0)
+++ fix-MALLOC_CHECK.patch	2011-01-26 18:59:44 UTC (rev 107554)
@@ -0,0 +1,23 @@
+Index: startkde.cmake
+===================================================================
+--- startkde.cmake	(revision 1217283)
++++ startkde.cmake	(revision 1217284)
+@@ -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