summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2007-07-06 06:17:48 +0000
committerTiziano Müller <dev-zero@gentoo.org>2007-07-06 06:17:48 +0000
commit6673f2a9e31ec80a2ad783b1e29512a8fb6903e9 (patch)
treecd8a7fa9e2105a79606d8559590be723dd94d583 /dev-libs/xmlwrapp
parentx86 stable, bug 184332 (diff)
downloadhistorical-6673f2a9e31ec80a2ad783b1e29512a8fb6903e9.tar.gz
historical-6673f2a9e31ec80a2ad783b1e29512a8fb6903e9.tar.bz2
historical-6673f2a9e31ec80a2ad783b1e29512a8fb6903e9.zip
Fixed gcc-4.2/namespace issue (bug #162165)
Package-Manager: portage-2.1.3_rc6
Diffstat (limited to 'dev-libs/xmlwrapp')
-rw-r--r--dev-libs/xmlwrapp/ChangeLog6
-rw-r--r--dev-libs/xmlwrapp/Manifest20
-rw-r--r--dev-libs/xmlwrapp/files/xmlwrapp-0.5.0-gcc42_namespace.patch20
-rw-r--r--dev-libs/xmlwrapp/xmlwrapp-0.5.0-r1.ebuild3
4 files changed, 39 insertions, 10 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/Manifest b/dev-libs/xmlwrapp/Manifest
index 8c1d2bd70e8e..c91590532e34 100644
--- a/dev-libs/xmlwrapp/Manifest
+++ b/dev-libs/xmlwrapp/Manifest
@@ -2,6 +2,10 @@ AUX xmlwrapp-0.5.0-fbsd.patch 371 RMD160 0dc90793978423b492edaed03a67766f9e19287
MD5 9859a46c0736a88ffb4ff41f5f53d27d files/xmlwrapp-0.5.0-fbsd.patch 371
RMD160 0dc90793978423b492edaed03a67766f9e192876 files/xmlwrapp-0.5.0-fbsd.patch 371
SHA256 7e6e9879147ac3cda92f1e6a276cb522a881a5e302e6f72314273a61c7cc7fe0 files/xmlwrapp-0.5.0-fbsd.patch 371
+AUX xmlwrapp-0.5.0-gcc42_namespace.patch 729 RMD160 e46409d6bba004c2af9d14682f93b8dc38edf0ed SHA1 2ee00bea583728a77571e4c995bbb3c29a96db69 SHA256 80d6823ca40f2c2521662acbee0425a749b9b5c409e82348dbc46cfc44a82492
+MD5 c99c23c4ef8b87f4f526cdee67b7b788 files/xmlwrapp-0.5.0-gcc42_namespace.patch 729
+RMD160 e46409d6bba004c2af9d14682f93b8dc38edf0ed files/xmlwrapp-0.5.0-gcc42_namespace.patch 729
+SHA256 80d6823ca40f2c2521662acbee0425a749b9b5c409e82348dbc46cfc44a82492 files/xmlwrapp-0.5.0-gcc42_namespace.patch 729
AUX xmlwrapp-0.5.0-tests.patch 1603 RMD160 76537d1e3a3bb55e381f0048034e67143a501b72 SHA1 7674061489c6e902c4b844423d22a39cf4cd2feb SHA256 5ab20e2672cf1696a15e55f4e1444e1a4e03ee9b73e0270385bf8199751671d3
MD5 beffa94a0ec1dd321d4342408f73ab01 files/xmlwrapp-0.5.0-tests.patch 1603
RMD160 76537d1e3a3bb55e381f0048034e67143a501b72 files/xmlwrapp-0.5.0-tests.patch 1603
@@ -11,14 +15,14 @@ MD5 55066e7026cd8b9a9f6820015d0a986c files/xmlwrapp-gentoo.diff 469
RMD160 30c11edc2ff76e752b236a404fc02a466db27e9e files/xmlwrapp-gentoo.diff 469
SHA256 4f153d3ac057c918cebf27eaa79cddd3a49028641d315c1c4e295b3b530be332 files/xmlwrapp-gentoo.diff 469
DIST xmlwrapp-0.5.0.tgz 442550 RMD160 2ecc840a910ea7231650f1cc6e3a071944ca696e SHA1 574f6b7c3715d351fb07a77dcd8bf42de07cfc1f SHA256 af3b71a6983c5c08e00096f5bb9f8ce61de3147f020aef327624043736d5ac73
-EBUILD xmlwrapp-0.5.0-r1.ebuild 1435 RMD160 5f86b3f5157ed4eff7742825dc0f7c5a265b0814 SHA1 74b3a0de233185cc3b3899940878596c6f57feb2 SHA256 0d80e59634089e2771ef09be423e597d9a04700c002e573a7d7f4eb095d04a08
-MD5 0f0c2c8f82c0b20f9cb97665039d97c0 xmlwrapp-0.5.0-r1.ebuild 1435
-RMD160 5f86b3f5157ed4eff7742825dc0f7c5a265b0814 xmlwrapp-0.5.0-r1.ebuild 1435
-SHA256 0d80e59634089e2771ef09be423e597d9a04700c002e573a7d7f4eb095d04a08 xmlwrapp-0.5.0-r1.ebuild 1435
-MISC ChangeLog 3450 RMD160 ad19f1cb7b88de8be531b1a961a65d287a0eb979 SHA1 d1706948f4bc478fb42bb0187a960f0482c92f18 SHA256 c3f1e5954040bf3885b9d74a295ee74349f1f8a0dfd3cd025e5025674c7d514d
-MD5 60393d938e709c2d65d395551e11ccde ChangeLog 3450
-RMD160 ad19f1cb7b88de8be531b1a961a65d287a0eb979 ChangeLog 3450
-SHA256 c3f1e5954040bf3885b9d74a295ee74349f1f8a0dfd3cd025e5025674c7d514d ChangeLog 3450
+EBUILD xmlwrapp-0.5.0-r1.ebuild 1484 RMD160 db4bdb7134215ba78c23e86747fdcb0c7b7deb01 SHA1 51b3e5820c0c24949c43c393c82ef31c27b0ade7 SHA256 77143dbc9142dff331a6619dc02258bde1ea9d88e15153eeb8d5862e5ba1fa62
+MD5 a4892d0dac2c1762b134e09cbfdd74a9 xmlwrapp-0.5.0-r1.ebuild 1484
+RMD160 db4bdb7134215ba78c23e86747fdcb0c7b7deb01 xmlwrapp-0.5.0-r1.ebuild 1484
+SHA256 77143dbc9142dff331a6619dc02258bde1ea9d88e15153eeb8d5862e5ba1fa62 xmlwrapp-0.5.0-r1.ebuild 1484
+MISC ChangeLog 3623 RMD160 098c902074f4c5cc9eaf524ced8870e7036aa6b5 SHA1 012dfc7b002754e15d60d871a2a10e75a08c011d SHA256 9d5d0dfb1efdaa28e268ceb0ce9af2d728dee6077397481bb46843eda568ffd2
+MD5 ae51ea626e4921b92b16936878f16ae8 ChangeLog 3623
+RMD160 098c902074f4c5cc9eaf524ced8870e7036aa6b5 ChangeLog 3623
+SHA256 9d5d0dfb1efdaa28e268ceb0ce9af2d728dee6077397481bb46843eda568ffd2 ChangeLog 3623
MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
MD5 694f01269d0e6ca70d0d588a68181808 metadata.xml 157
RMD160 1a16d7c8813911ff609857e1d437b678c924114c metadata.xml 157
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"
}