From 533ae091d84c1e3c81f49cd4e82d0c6e14868794 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 16 Sep 2014 01:36:49 +0000
Subject: [PATCH] extra/valgrind to 3.10.0-1

---
 extra/valgrind/PKGBUILD                            | 14 +++++++-------
 ...-2.19.patch => valgrind-3.9.0-glibc-2.20.patch} | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)
 rename extra/valgrind/{valgrind-3.9.0-glibc-2.19.patch => valgrind-3.9.0-glibc-2.20.patch} (82%)

diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index ed35b16c2..5083d5d3c 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -9,25 +9,25 @@
 noautobuild=1
 
 pkgname=valgrind
-pkgver=3.9.0
-pkgrel=5
+pkgver=3.10.0
+pkgrel=1
 pkgdesc='A tool to help find memory-management problems in programs'
 arch=(i686 x86_64)
 license=(GPL)
 url='http://valgrind.org/'
-depends=('glibc>=2.19' 'glibc<2.20' 'perl')
+depends=('glibc>=2.20' 'glibc<2.21' 'perl')
 makedepends=('gdb')
 options=('staticlibs' '!emptydirs')
 source=(http://valgrind.org/downloads/$pkgname-$pkgver.tar.bz2
         alarm.patch
-        valgrind-3.9.0-glibc-2.19.patch)
-sha1sums=('9415e28933de9d6687f993c4bb797e6bd49583f1'
+        valgrind-3.9.0-glibc-2.29.patch)
+sha1sums=('aec0b8cd042ec36c8cce4f6027b98627ab202f26'
           '3669a2f6e8c34ad95d05ecc92fe7b2d6661edc76'
-          '4653e994d2660490c51a97cc70e45a506e80bfab')
+          '2080c3d44de20857f18b03a93404a8f3d3721f7e')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.19.patch
+  patch -p1 -i "$srcdir"/valgrind-3.9.0-glibc-2.20.patch
   [ "${CARCH}" = "arm" -o "${CARCH}" = "armv6h" ] && patch -Np1 -i ${srcdir}/alarm.patch
 }
 
diff --git a/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch b/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch
similarity index 82%
rename from extra/valgrind/valgrind-3.9.0-glibc-2.19.patch
rename to extra/valgrind/valgrind-3.9.0-glibc-2.20.patch
index 79a3283c9..d9c622e93 100644
--- a/extra/valgrind/valgrind-3.9.0-glibc-2.19.patch
+++ b/extra/valgrind/valgrind-3.9.0-glibc-2.20.patch
@@ -5,11 +5,11 @@ diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure
  	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  	;;
-+     2.19)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
-+$as_echo "2.19 family" >&6; }
++     2.20)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.20 family" >&5
++$as_echo "2.20 family" >&6; }
 +
-+$as_echo "#define GLIBC_2_19 1" >>confdefs.h
++$as_echo "#define GLIBC_2_20 1" >>confdefs.h
 +
 +	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
 +	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
@@ -25,9 +25,9 @@ diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac
  	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
  	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
  	;;
-+     2.19)
-+	AC_MSG_RESULT(2.19 family)
-+	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
++     2.20)
++	AC_MSG_RESULT(2.20 family)
++	AC_DEFINE([GLIBC_2_20], 1, [Define to 1 if you're using glibc 2.20.x])
 +	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
 +	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
 +	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"