diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2007-07-06 06:17:48 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2007-07-06 06:17:48 +0000 |
| commit | 77d6f39b79cc87fc72aca4b7aa2075505ce02104 (patch) | |
| tree | e45428e966dfafe0d03948c3ef5b909de1a4e900 /dev-libs | |
| parent | x86 stable, bug 184332 (diff) | |
| download | gentoo-2-77d6f39b79cc87fc72aca4b7aa2075505ce02104.tar.gz gentoo-2-77d6f39b79cc87fc72aca4b7aa2075505ce02104.tar.bz2 gentoo-2-77d6f39b79cc87fc72aca4b7aa2075505ce02104.zip | |
Fixed gcc-4.2/namespace issue (bug #162165)
(Portage version: 2.1.3_rc6)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/xmlwrapp/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch | 20 | ||||
| -rw-r--r-- | dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/dev-libs/xmlwrapp/ChangeLog b/dev-libs/xmlwrapp/ChangeLog index 21fe7caaef06..aab8008ad8cc 100644 --- a/dev-libs/xmlwrapp/ChangeLog +++ b/dev-libs/xmlwrapp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/xmlwrapp # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/ChangeLog,v 1.28 2007/02/28 14:42:15 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/ChangeLog,v 1.29 2007/07/06 06:17:47 dev-zero Exp $ + + 06 Jul 2007; Tiziano Müller <dev-zero@gentoo.org> + +files/xmlwrapp-0.5.0-gcc42_namespace.patch, xmlwrapp-0.5.0-r1.ebuild: + Fixed gcc-4.2/namespace issue (bug #162165) 28 Feb 2007; Javier Villavicencio <the_paya@gentoo.org> xmlwrapp-0.5.0-r1.ebuild: diff --git a/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch new file mode 100644 index 000000000000..6b61bcb60641 --- /dev/null +++ b/dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch @@ -0,0 +1,20 @@ +--- xmlwrapp-0.5.0/src/libxml/node.cxx.orig 2007-07-06 08:13:31.000000000 +0200 ++++ xmlwrapp-0.5.0/src/libxml/node.cxx 2007-07-06 08:13:05.000000000 +0200 +@@ -512,10 +512,12 @@ + } + } + //#################################################################### +-std::ostream& xml::operator<< (std::ostream &stream, const xml::node &n) { +- std::string xmldata; +- n.node_to_string(xmldata); +- stream << xmldata; +- return stream; ++namespace xml { ++ std::ostream& operator<< (std::ostream &stream, const xml::node &n) { ++ std::string xmldata; ++ n.node_to_string(xmldata); ++ stream << xmldata; ++ return stream; ++ } + } + //#################################################################### diff --git a/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild b/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild index 22ac9474544a..310ea80e977d 100644 --- a/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild +++ b/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild,v 1.17 2007/02/28 14:42:15 the_paya Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild,v 1.18 2007/07/06 06:17:47 dev-zero Exp $ inherit eutils toolchain-funcs @@ -24,6 +24,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-gentoo.diff" epatch "${FILESDIR}/${P}-tests.patch" epatch "${FILESDIR}/${P}-fbsd.patch" + epatch "${FILESDIR}/${P}-gcc42_namespace.patch" sed -i 's/-O2//' tools/cxxflags || die "sed tools/cxxflags failed" } |