Add patch to fix compilation with gcc-4.1; bug #125596

(Portage version: 2.1_pre7-r4)

4 files changed, 40 insertions, 6 deletions

diff --git a/app-accessibility/dasher/ChangeLog b/app-accessibility/dasher/ChangeLog
index 63d9c582eb52..32ec37fde80a 100644
--- a/app-accessibility/dasher/ChangeLog
+++ b/app-accessibility/dasher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-accessibility/dasher
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.59 2006/03/16 22:30:37 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/ChangeLog,v 1.60 2006/04/09 04:34:56 halcy0n Exp $
+
+  09 Apr 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/dasher-3.2.18-gcc41.patch, dasher-3.2.18.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #125596
 
 *dasher-4.0.0 (16 Mar 2006)
 
diff --git a/app-accessibility/dasher/Manifest b/app-accessibility/dasher/Manifest
index 52773c7d00cc..a48370c4c51e 100644
--- a/app-accessibility/dasher/Manifest
+++ b/app-accessibility/dasher/Manifest
@@ -4,9 +4,9 @@ SHA256 28550776ad6ee3d3f46064b0fc25ea18b1ea0ce5e55d515e837f627dc7dc03b3 ChangeLo
 MD5 bcb3b4f70ce6d5424e5a362938351281 dasher-3.2.15.ebuild 1632
 RMD160 74c1c3efa81fcc9e697148a7bc3692829ba153f8 dasher-3.2.15.ebuild 1632
 SHA256 10cafa3b7255f8b6f5e1dad8a8043ce24fb6e05e74ebbafe795e1614474cfa10 dasher-3.2.15.ebuild 1632
-MD5 9cf84d662ec0c1f59dbcd55b486fdd1b dasher-3.2.18.ebuild 1743
-RMD160 2611167d674f62db58d75de07bd5f7b57f8feef8 dasher-3.2.18.ebuild 1743
-SHA256 8140f48ee563d52098cf43206290611d9e521b7d75069e578b7f7313e7141cc8 dasher-3.2.18.ebuild 1743
+MD5 81bd7315247bb92ccb46d18776a8c98f dasher-3.2.18.ebuild 1785
+RMD160 88c774009a57b62fa6ce22e1e9c7e33156a38dac dasher-3.2.18.ebuild 1785
+SHA256 c19177f40d808cba7e52adb39bf0ac6dde26f8962b27c0d7ff6585024a43fb66 dasher-3.2.18.ebuild 1785
 MD5 6e91e85707af498aa7c8d6c1e7baeca2 dasher-4.0.0.ebuild 1653
 RMD160 f6744114fbcda00cd12b8e08fa191dfb1732c1a2 dasher-4.0.0.ebuild 1653
 SHA256 ff8a10aec9d7ae6f711b7991231211b116157d923fdf756132ca60be6c93c00f dasher-4.0.0.ebuild 1653
@@ -16,6 +16,9 @@ SHA256 77f7f87ebcb16f558539958100d67143f0b6bde7de711b507783bf1a8dfa6f40 files/da
 MD5 29b515c44bcfdd79db45f38f65879994 files/dasher-3.2.15-buildwindowtree.patch 499
 RMD160 772adb87c05e34e996467d0e90e2b090d853f182 files/dasher-3.2.15-buildwindowtree.patch 499
 SHA256 dd69c7f44c1722c54a40d725cdeb8e3c92e3f5d0aa687f70b481f2877d42299c files/dasher-3.2.15-buildwindowtree.patch 499
+MD5 73559b858e1157838f8da65896ce9162 files/dasher-3.2.18-gcc41.patch 1286
+RMD160 d730502e8e36eb0830811fa99c727f5dba58488d files/dasher-3.2.18-gcc41.patch 1286
+SHA256 c5dc1087f7aecf53fa037146a6910697e5b731e37052c698e5441923ca675b8d files/dasher-3.2.18-gcc41.patch 1286
 MD5 5b4b3e17b421919e17bc182404ffa36c files/digest-dasher-3.2.15 67
 RMD160 ed2649b596ba6405c00efbb2a553a8eec71893fe files/digest-dasher-3.2.15 67
 SHA256 0b016320e3e8a6a25102df304610264a831bf6e1f3d4829c58f3119f9ce22378 files/digest-dasher-3.2.15 67
diff --git a/app-accessibility/dasher/dasher-3.2.18.ebuild b/app-accessibility/dasher/dasher-3.2.18.ebuild
index 44f63caf172d..023e5b159d00 100644
--- a/app-accessibility/dasher/dasher-3.2.18.ebuild
+++ b/app-accessibility/dasher/dasher-3.2.18.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/app-accessibility/dasher/dasher-3.2.18.ebuild,v 1.10 2006/02/06 04:54:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/dasher/dasher-3.2.18.ebuild,v 1.11 2006/04/09 04:34:57 halcy0n Exp $
 
 inherit eutils gnome2
 
@@ -65,7 +65,9 @@ src_unpack() {
 	cd "${S}"
 
 	# Poor pointer management causes segfault at startup
-	epatch ${FILESDIR}/${PN}-3.2.15-buildwindowtree.patch
+	epatch "${FILESDIR}"/${PN}-3.2.15-buildwindowtree.patch
+
+	epatch "${FILESDIR}"/${P}-gcc41.patch
 
 	gnome2_omf_fix Data/Help/Gnome/*/Makefile.in
 }
diff --git a/app-accessibility/dasher/files/dasher-3.2.18-gcc41.patch b/app-accessibility/dasher/files/dasher-3.2.18-gcc41.patch
new file mode 100644
index 000000000000..bebcee736ce2
--- /dev/null
+++ b/app-accessibility/dasher/files/dasher-3.2.18-gcc41.patch
@@ -0,0 +1,25 @@
+diff -ur dasher-3.2.18-orig/Src/DasherCore/DasherViewSquare.h dasher-3.2.18/Src/DasherCore/DasherViewSquare.h
+--- dasher-3.2.18-orig/Src/DasherCore/DasherViewSquare.h	2006-03-30 19:36:15.000000000 -0500
++++ dasher-3.2.18/Src/DasherCore/DasherViewSquare.h	2006-03-30 19:37:57.000000000 -0500
+@@ -33,7 +33,7 @@
+ 	virtual void RenderNodes();
+ 	
+ 	void ChangeScreen(CDasherScreen* NewScreen);
+-	void CDasherViewSquare::DrawGoTo(screenint mousex, screenint mousey);
++	void DrawGoTo(screenint mousex, screenint mousey);
+ 	void DrawMouse(screenint mousex, screenint mousey);
+ 	void DrawMouseLine(screenint mousex, screenint mousey);
+ 	void DrawKeyboard();
+diff -ur dasher-3.2.18-orig/Src/DasherCore/LanguageModelling/SymbolAlphabet.h dasher-3.2.18/Src/DasherCore/LanguageModelling/SymbolAlphabet.h
+--- dasher-3.2.18-orig/Src/DasherCore/LanguageModelling/SymbolAlphabet.h	2006-03-30 19:36:15.000000000 -0500
++++ dasher-3.2.18/Src/DasherCore/LanguageModelling/SymbolAlphabet.h	2006-03-30 19:36:45.000000000 -0500
+@@ -38,7 +38,7 @@
+ 		// iSize is the number of Symbols - please dont change the constructor
+ 		// Add functions to set customizable behaviour
+ 
+-		CSymbolAlphabet::CSymbolAlphabet(int iSize)
++		CSymbolAlphabet(int iSize)
+ 			: m_iSize(iSize)
+ 		{
+ 		  //			DASHER_ASSERT(iSize>0);
+