Added gcc4.1 patch

Package-Manager: portage-2.1

5 files changed, 54 insertions, 7 deletions

diff --git a/x11-misc/vym/ChangeLog b/x11-misc/vym/ChangeLog
index b6170992664a..4df46b459c7d 100644
--- a/x11-misc/vym/ChangeLog
+++ b/x11-misc/vym/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/vym
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.8 2006/01/08 13:06:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/ChangeLog,v 1.9 2006/06/11 15:04:12 stuart Exp $
+
+  11 Jun 2006; Stuart Herbert <stuart@gentoo.org> +files/03_gcc41.patch,
+  vym-1.7.0.ebuild:
+  Added patch for gcc-4.1, closes bug 135496
+  Thanks for Ron MacNeil <macro@hotmail.com> for the patch
 
   08 Jan 2006; Stefan Schweizer <genstef@gentoo.org> vym-1.7.0.ebuild:
   modular depends, bug 118241
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index a36117bc0919..2ae9b0aa45bf 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,8 +1,36 @@
-MD5 8749317ff9b823bc503529820822f9c5 ChangeLog 1338
+AUX 01_all_linkablemapobj-math.patch 257 RMD160 9e3e58b14089708a7fd19746d1564c78a5ea6057 SHA1 240c4bfd9a1e868eb4b839abfe5674f1c5cecd05 SHA256 22ecb278804b2db2af7877f85a67062bb65dd2cdb875b77a6810d038c9226e76
 MD5 804c86f8b5889577f645afed31c91bae files/01_all_linkablemapobj-math.patch 257
+RMD160 9e3e58b14089708a7fd19746d1564c78a5ea6057 files/01_all_linkablemapobj-math.patch 257
+SHA256 22ecb278804b2db2af7877f85a67062bb65dd2cdb875b77a6810d038c9226e76 files/01_all_linkablemapobj-math.patch 257
+AUX 02_all_misc-math.patch 203 RMD160 3e435b44afd99e89c934f9daafca28b8bf854a87 SHA1 7c50b049edebcd80e4d27a3ddc0319e0f23d4dcd SHA256 47ef2a05a50b6b95f3e16c4f229df318119b12b9c184e4f641747415f5d4d71b
 MD5 948f4acff0959a29eecd5b98ca3c024c files/02_all_misc-math.patch 203
-MD5 8fce434ffdaec3d9f4f995d4d8f11240 files/digest-vym-1.5.0 61
-MD5 7203f0001fc3aec8b75fded692d2ed4a files/digest-vym-1.7.0 61
-MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
+RMD160 3e435b44afd99e89c934f9daafca28b8bf854a87 files/02_all_misc-math.patch 203
+SHA256 47ef2a05a50b6b95f3e16c4f229df318119b12b9c184e4f641747415f5d4d71b files/02_all_misc-math.patch 203
+AUX 03_gcc41.patch 474 RMD160 e1d5811ef6aba38bd90206fc154a16993b2be56e SHA1 ffbdd62eb3a2cf05eadfad30f9f20b4a6fcf3fc0 SHA256 9273c7fa7e846d3667a68bf2d579b3410b7697f6bcfb14a75f9c732f31da9282
+MD5 f62a9d5224be69fd84313332cae4cd64 files/03_gcc41.patch 474
+RMD160 e1d5811ef6aba38bd90206fc154a16993b2be56e files/03_gcc41.patch 474
+SHA256 9273c7fa7e846d3667a68bf2d579b3410b7697f6bcfb14a75f9c732f31da9282 files/03_gcc41.patch 474
+DIST vym-1.5.0.tar.gz 326937
+DIST vym-1.7.0.tar.gz 592231 RMD160 ef336b671e04872762dd9c721abcfdd03c8efd96 SHA1 48dd8474a7003a8f2fd66e26cf8eb056e030e1ea SHA256 273063cec9227ce6600baf9859715597c2d1ce43aa1c94bf6391b6850929a722
+EBUILD vym-1.5.0.ebuild 1338 RMD160 6ad8de9818bcda2a6b1f05174329fcbb688bd490 SHA1 74c2287126a8471ce684710f99c0d32e2bb98e35 SHA256 79b91f9bd76e6c80c678b5c29f21bfa6a9d8f14729134a6616c7fad364d972de
 MD5 b0921da33fa1a9737b4a05a75fb07ff6 vym-1.5.0.ebuild 1338
-MD5 83826066219303efd717c9e135736141 vym-1.7.0.ebuild 1219
+RMD160 6ad8de9818bcda2a6b1f05174329fcbb688bd490 vym-1.5.0.ebuild 1338
+SHA256 79b91f9bd76e6c80c678b5c29f21bfa6a9d8f14729134a6616c7fad364d972de vym-1.5.0.ebuild 1338
+EBUILD vym-1.7.0.ebuild 1253 RMD160 b9996ea4234a7f444f7731c97401d300ccdd71f2 SHA1 f79b35e9882946baf7771bb9c19457e3e81e2bd2 SHA256 2aed3f4ff680619a9713a998dbcacea08ef8dc1b60612b1aa181e95abca212be
+MD5 df177b32551807bf58504d47f4a20483 vym-1.7.0.ebuild 1253
+RMD160 b9996ea4234a7f444f7731c97401d300ccdd71f2 vym-1.7.0.ebuild 1253
+SHA256 2aed3f4ff680619a9713a998dbcacea08ef8dc1b60612b1aa181e95abca212be vym-1.7.0.ebuild 1253
+MISC ChangeLog 1535 RMD160 8768acca60f03e3fb27a157bfc92070263ea2161 SHA1 c3c7530d01fc5af30d6bd889d916ef36f514ae81 SHA256 3831071abcf13fb634da1d6c093be22db94141fb60a82faf5b91276a30170709
+MD5 68bf07667e7358f797208043630e4978 ChangeLog 1535
+RMD160 8768acca60f03e3fb27a157bfc92070263ea2161 ChangeLog 1535
+SHA256 3831071abcf13fb634da1d6c093be22db94141fb60a82faf5b91276a30170709 ChangeLog 1535
+MISC metadata.xml 222 RMD160 5d27e84dc0fadb664912c5ea4992fb0909f1b523 SHA1 a63624aa10decbf96d6799d1a66931d2525693e8 SHA256 ad1475a662bc88f3f7c5178e94806bcb1f51b5a8da52aee8f69efa4f2b4bba5a
+MD5 71da003bb2109fed15aff6635287c6a6 metadata.xml 222
+RMD160 5d27e84dc0fadb664912c5ea4992fb0909f1b523 metadata.xml 222
+SHA256 ad1475a662bc88f3f7c5178e94806bcb1f51b5a8da52aee8f69efa4f2b4bba5a metadata.xml 222
+MD5 8fce434ffdaec3d9f4f995d4d8f11240 files/digest-vym-1.5.0 61
+RMD160 630ea82f5d1c06f50e70a3d31fc721e2390971ea files/digest-vym-1.5.0 61
+SHA256 665313c2707b615a8cf64eff0a410d745e24b5f6f6745a4071ae4cb861ea8c6d files/digest-vym-1.5.0 61
+MD5 aab5b86cbc2ad910b48f110945da35cd files/digest-vym-1.7.0 229
+RMD160 d1f483cd84f1493cae2b934e6f7dea73aedd4232 files/digest-vym-1.7.0 229
+SHA256 d800ead59a4428958d01689935c359a9aa30d808b98e1bf2eb223c22544084db files/digest-vym-1.7.0 229
diff --git a/x11-misc/vym/files/03_gcc41.patch b/x11-misc/vym/files/03_gcc41.patch
new file mode 100644
index 000000000000..d0595ef99211
--- /dev/null
+++ b/x11-misc/vym/files/03_gcc41.patch
@@ -0,0 +1,11 @@
+--- xml.h.orig	2006-06-04 21:39:54.000000000 +1000
++++ xml.h	2006-06-04 21:40:14.000000000 +1000
+@@ -16,7 +16,7 @@
+ 	~mapBuilderHandler();
+ 	QString errorProtocol();
+ 	bool startDocument();
+-	QString mapBuilderHandler::parseHREF(QString);
++	QString parseHREF(QString);
+ 	bool startElement ( const QString&, const QString&,
+                         const QString& eName, const QXmlAttributes& atts ); 
+ 	bool   endElement ( const QString&, const QString&, const QString& ); 
diff --git a/x11-misc/vym/files/digest-vym-1.7.0 b/x11-misc/vym/files/digest-vym-1.7.0
index a348370105cb..45a4e4712f0a 100644
--- a/x11-misc/vym/files/digest-vym-1.7.0
+++ b/x11-misc/vym/files/digest-vym-1.7.0
@@ -1 +1,3 @@
 MD5 f1d4ba9f5a2362a213f7ff90ad6cdfec vym-1.7.0.tar.gz 592231
+RMD160 ef336b671e04872762dd9c721abcfdd03c8efd96 vym-1.7.0.tar.gz 592231
+SHA256 273063cec9227ce6600baf9859715597c2d1ce43aa1c94bf6391b6850929a722 vym-1.7.0.tar.gz 592231
diff --git a/x11-misc/vym/vym-1.7.0.ebuild b/x11-misc/vym/vym-1.7.0.ebuild
index 385e4d39286d..847de14dafd1 100644
--- a/x11-misc/vym/vym-1.7.0.ebuild
+++ b/x11-misc/vym/vym-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.7.0.ebuild,v 1.3 2006/01/08 13:06:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/vym/vym-1.7.0.ebuild,v 1.4 2006/06/11 15:04:12 stuart Exp $
 
 inherit eutils qt3
 
@@ -25,6 +25,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/01_all_linkablemapobj-math.patch
 	epatch ${FILESDIR}/02_all_misc-math.patch
+	epatch ${FILESDIR}/03_gcc41.patch
 }
 
 src_compile() {