From b71fa9bd76a8129a0bb29c5728bcabc95a7faaad Mon Sep 17 00:00:00 2001
From: Peter Wang
Date: Mon, 5 Sep 2011 21:30:16 -0400
Subject: development/valgrind: Apply upstream patches to fix a bug.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 development/valgrind/valgrind.SlackBuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'development/valgrind/valgrind.SlackBuild')

diff --git a/development/valgrind/valgrind.SlackBuild b/development/valgrind/valgrind.SlackBuild
index 74baa814e0..120d422e77 100644
--- a/development/valgrind/valgrind.SlackBuild
+++ b/development/valgrind/valgrind.SlackBuild
@@ -6,7 +6,7 @@
 
 PRGNAM=valgrind
 VERSION=3.6.1
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 # Automatically determine the architecture we're building on:
@@ -36,7 +36,7 @@ elif [ "$ARCH" = "x86_64" ]; then
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
-fi 
+fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -47,6 +47,11 @@ cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Apply upstream patches to fix https://bugs.kde.org/show_bug.cgi?id=277045
+# Thanks to Ricardo Nabinger Sanchez for reporting the solution.
+patch -p0 < $CWD/valgrind-r11856.patch || exit 1
+patch -p0 < $CWD/valgrind-r11904.patch || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -70,7 +75,7 @@ cp -a AUTHORS COPYING FAQ.txt NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/valgrind/html $PKG/usr/doc/$PRGNAM-$VERSION
 # The doc directory is the only thing in $PKG/usr/share, and the only things
-# left in it now are pdf and a ps doc files.  They are large, so we won't keep 
+# left in it now are pdf and a ps doc files.  They are large, so we won't keep
 # them around.  If you still want them, uncomment the line below.
 # mv $PKG/usr/share/doc/valgrind/*.{ps,pdf} $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share
-- 
cgit v1.2.3