diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-11-24 14:36:49 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-11-24 14:36:49 +0000 |
| commit | 81694b6a9561660bbd0701eaa34491a4a1f14105 (patch) | |
| tree | 748eec5dc6eec09a3786d27a7cd31ce335fc4827 | |
| parent | Fix LICENSE, "BSD license" according to file headers. (diff) | |
| download | gentoo-2-81694b6a9561660bbd0701eaa34491a4a1f14105.tar.gz gentoo-2-81694b6a9561660bbd0701eaa34491a4a1f14105.tar.bz2 gentoo-2-81694b6a9561660bbd0701eaa34491a4a1f14105.zip | |
fix build with gcc 4.7, bug #425274
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
| -rw-r--r-- | media-libs/raul/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/raul/files/raul-0.8.0-gcc47.patch | 45 | ||||
| -rw-r--r-- | media-libs/raul/raul-0.8.0.ebuild | 3 |
3 files changed, 52 insertions, 2 deletions
diff --git a/media-libs/raul/ChangeLog b/media-libs/raul/ChangeLog index 09b1def7e68e..a4d43d46b2f4 100644 --- a/media-libs/raul/ChangeLog +++ b/media-libs/raul/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/raul # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/ChangeLog,v 1.16 2012/06/01 20:54:57 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/ChangeLog,v 1.17 2012/11/24 14:36:49 aballier Exp $ + + 24 Nov 2012; Alexis Ballier <aballier@gentoo.org> raul-0.8.0.ebuild, + +files/raul-0.8.0-gcc47.patch: + fix build with gcc 4.7, bug #425274 01 Jun 2012; Ian Stakenvicius <axs@gentoo.org> -raul-0.5.1.ebuild, -files/raul-0.5.1-gcc44.patch, -raul-0.6.0.ebuild, -raul-0.7.0.ebuild, diff --git a/media-libs/raul/files/raul-0.8.0-gcc47.patch b/media-libs/raul/files/raul-0.8.0-gcc47.patch new file mode 100644 index 000000000000..c9cb2d080931 --- /dev/null +++ b/media-libs/raul/files/raul-0.8.0-gcc47.patch @@ -0,0 +1,45 @@ +https://bugs.gentoo.org/show_bug.cgi?id=425274 +Build with gcc 4.7 + +Index: raul-0.8.0/raul/PathTable.hpp +=================================================================== +--- raul-0.8.0.orig/raul/PathTable.hpp ++++ raul-0.8.0/raul/PathTable.hpp +@@ -37,13 +37,13 @@ public: + typename Table<Path, T>::iterator find_descendants_end( + typename Table<Path, T>::iterator parent) + { +- return find_range_end(parent, &Path::descendant_comparator); ++ return this->find_range_end(parent, &Path::descendant_comparator); + } + + typename Table<Path, T>::const_iterator find_descendants_end( + typename Table<Path, T>::const_iterator parent) const + { +- return find_range_end(parent, &Path::descendant_comparator); ++ return this->find_range_end(parent, &Path::descendant_comparator); + } + }; + +Index: raul-0.8.0/raul/TableImpl.hpp +=================================================================== +--- raul-0.8.0.orig/raul/TableImpl.hpp ++++ raul-0.8.0/raul/TableImpl.hpp +@@ -249,7 +249,7 @@ Table<K, T>::cram(const Table<K,T>& rang + assert(is_sorted()); + #endif + +- return make_pair(iterator(*this, insert_index), true); ++ return std::make_pair(iterator(*this, insert_index), true); + } + + +@@ -339,7 +339,7 @@ Table<K, T>::operator[](const K& key) + if (i != end()) { + return i->second; + } else { +- std::pair<iterator,bool> ret = insert(make_pair(key, T())); ++ std::pair<iterator,bool> ret = insert(std::make_pair(key, T())); + return ret.first->second; + } + } diff --git a/media-libs/raul/raul-0.8.0.ebuild b/media-libs/raul/raul-0.8.0.ebuild index bd3c9ad91adf..6cb738e58b8b 100644 --- a/media-libs/raul/raul-0.8.0.ebuild +++ b/media-libs/raul/raul-0.8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/raul-0.8.0.ebuild,v 1.5 2012/06/01 20:25:07 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/raul/raul-0.8.0.ebuild,v 1.6 2012/11/24 14:36:49 aballier Exp $ EAPI=4 @@ -31,6 +31,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/ldconfig2.patch" + epatch "${FILESDIR}/${P}-gcc47.patch" } src_configure() { |