gcc 3.4 fix

4 files changed, 52 insertions, 11 deletions

diff --git a/x11-misc/ttmkfdir/ChangeLog b/x11-misc/ttmkfdir/ChangeLog
index 3861b0f99cf2..cba73ca69224 100644
--- a/x11-misc/ttmkfdir/ChangeLog
+++ b/x11-misc/ttmkfdir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/ttmkfdir
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.30 2004/04/13 11:51:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.31 2004/04/22 20:52:34 lv Exp $
+
+  22 Apr 2004; Travis Tilley <lv@gentoo.org>
+  +files/ttmkfdir-3.0.9-gcc34.patch, ttmkfdir-3.0.9-r1.ebuild:
+  added fix for compiling with gcc 3.4
 
   13 Apr 2004; Guy Martin <gmsoft@gentoo.org> ttmkfdir-3.0.9-r1.ebuild:
   Marked stable on hppa.
diff --git a/x11-misc/ttmkfdir/Manifest b/x11-misc/ttmkfdir/Manifest
index edd54a3fb604..67c709cf15b0 100644
--- a/x11-misc/ttmkfdir/Manifest
+++ b/x11-misc/ttmkfdir/Manifest
@@ -1,13 +1,14 @@
-MD5 382564c942a2468ea2d5fd9cefd05cfe ChangeLog 3964
-MD5 843cab92335df3549750d11e86fa961c ttmkfdir-3.0.4.ebuild 854
-MD5 c6a356913eb8516d1b67e57b4c21ad19 ttmkfdir-3.0.9-r1.ebuild 1027
 MD5 0a2238d74160d047be464f9361beb773 ttmkfdir-3.0.9.ebuild 909
-MD5 504adfa6639ae2434cdafb013912b9da files/digest-ttmkfdir-3.0.4 66
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
-MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r1 66
-MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
+MD5 843cab92335df3549750d11e86fa961c ttmkfdir-3.0.4.ebuild 854
+MD5 4d6e450105478bdc646c265e2d489201 ttmkfdir-3.0.9-r1.ebuild 1061
+MD5 e4c5e4642f721865bf01ad1596144d56 ChangeLog 4108
 MD5 e285b7a7c7369e7947c0997de817d3ce files/ttmkfdir-2.0-gentoo.patch 688
 MD5 255516ccdde8cad5c8f7b6659f4bdde2 files/ttmkfdir-3.0.9-cpp.patch 505
-MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
-MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9-r1 66
+MD5 4a98d364009103c5afb6552165049585 files/ttmkfdir-3.0.9-gcc34.patch 878
 MD5 9b84e6d68d388eb67760658ba28d05c8 files/ttmkfdir2-ignore-FIRSTINDEX.patch 440
+MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
+MD5 537b2fa79d0feee2ffd2f994b227eb12 files/ttmkfdir-3.0.9-zlib.patch 1913
+MD5 504adfa6639ae2434cdafb013912b9da files/digest-ttmkfdir-3.0.4 66
+MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
+MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch
new file mode 100644
index 000000000000..7df899ef2e59
--- /dev/null
+++ b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc34.patch
@@ -0,0 +1,35 @@
+diff -Nurd builtin.cpp.old builtin.cpp
+--- builtin.cpp.old	2004-04-22 16:26:16.175065656 -0400
++++ builtin.cpp		2004-04-22 16:27:06.042484656 -0400
+@@ -600,7 +600,7 @@
+ 	0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
+     };
+ 
+-};
++}
+ 
+ Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = {
+     {256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}},
+diff -Nurd ttf.h.old ttf.h
+--- ttf.h.old	2004-04-22 16:26:16.176065504 -0400
++++ ttf.h	2004-04-22 16:27:06.042484656 -0400
+@@ -49,7 +49,7 @@
+ 	TT_Postscript	    *post;
+ 	std::string	    FileName;
+     };
+-};
++}
+ 
+ #endif /* TTF_H__ */
+ 
+diff -Nurd util.h.old util.h
+--- util.h.old	2004-04-22 16:26:16.176065504 -0400
++++ util.h	2004-04-22 16:27:06.042484656 -0400
+@@ -17,6 +17,6 @@
+ 	Singleton (void) {};
+ 	~Singleton (void) {};
+     };
+-}; 
++}
+ 
+ #endif // TTMKFDIRUTIL_H__
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild
index aaad1635467b..7fe280e470c5 100644
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild
+++ b/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild,v 1.9 2004/04/13 11:51:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9-r1.ebuild,v 1.10 2004/04/22 20:52:34 lv Exp $
 
 inherit eutils flag-o-matic
 
@@ -26,6 +26,7 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-cpp.patch
 	epatch ${FILESDIR}/${P}-zlib.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 }
 
 src_compile() {