Add fix from upstream for building with newer gcc versions.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 41 insertions, 4 deletions

diff --git a/dev-cpp/gtest/ChangeLog b/dev-cpp/gtest/ChangeLog
index 1a8b3939f406..7733c79cf20c 100644
--- a/dev-cpp/gtest/ChangeLog
+++ b/dev-cpp/gtest/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/gtest
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.3 2012/03/30 15:52:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.4 2012/04/20 18:18:06 vapier Exp $
+
+  20 Apr 2012; Mike Frysinger <vapier@gentoo.org> gtest-1.4.0.ebuild,
+  +files/gtest-1.4.0-gcc-4.7.patch:
+  Add fix from upstream for building with newer gcc versions.
 
 *gtest-1.6.0 (30 Mar 2012)
 
diff --git a/dev-cpp/gtest/files/gtest-1.4.0-gcc-4.7.patch b/dev-cpp/gtest/files/gtest-1.4.0-gcc-4.7.patch
new file mode 100644
index 000000000000..05c270004866
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.4.0-gcc-4.7.patch
@@ -0,0 +1,32 @@
+fix for upstream for building with newer gcc versions
+
+r339 | zhanyong.wan | 2009-11-12 21:54:23 -0500 (Thu, 12 Nov 2009) | 2 lines
+
+...; makes gtest-param-util-generated.h conform to the C++ standard (by Zhanyong Wan).
+
+Index: include/gtest/internal/gtest-param-util-generated.h
+===================================================================
+--- include/gtest/internal/gtest-param-util-generated.h	(revision 338)
++++ include/gtest/internal/gtest-param-util-generated.h	(revision 339)
+@@ -53,6 +53,21 @@
+ #if GTEST_HAS_PARAM_TEST
+ 
+ namespace testing {
++
++// Forward declarations of ValuesIn(), which is implemented in
++// include/gtest/gtest-param-test.h.
++template <typename ForwardIterator>
++internal::ParamGenerator<
++    typename ::std::iterator_traits<ForwardIterator>::value_type> ValuesIn(
++        ForwardIterator begin, ForwardIterator end);
++
++template <typename T, size_t N>
++internal::ParamGenerator<T> ValuesIn(const T (&array)[N]);
++
++template <class Container>
++internal::ParamGenerator<typename Container::value_type> ValuesIn(
++    const Container& container);
++
+ namespace internal {
+ 
+ // Used in the Values() function to provide polymorphic capabilities.
diff --git a/dev-cpp/gtest/gtest-1.4.0.ebuild b/dev-cpp/gtest/gtest-1.4.0.ebuild
index 1160e2fdf97a..bee2ff4eab13 100644
--- a/dev-cpp/gtest/gtest-1.4.0.ebuild
+++ b/dev-cpp/gtest/gtest-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.1 2011/11/11 20:09:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.4.0.ebuild,v 1.2 2012/04/20 18:18:06 vapier Exp $
 
 EAPI="2"
 inherit autotools eutils
@@ -20,7 +20,8 @@ RDEPEND=""
 src_prepare() {
 	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die "sed failed"
 
-	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
 	eautoreconf
 }