fix gcc-3.3 issues

5 files changed, 41 insertions, 17 deletions

diff --git a/x11-misc/ttmkfdir/ChangeLog b/x11-misc/ttmkfdir/ChangeLog
index 3ae4ad717540..a91809180d97 100644
--- a/x11-misc/ttmkfdir/ChangeLog
+++ b/x11-misc/ttmkfdir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/ttmkfdir
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.17 2003/04/09 02:41:38 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ChangeLog,v 1.18 2003/07/21 21:46:23 azarah Exp $
+
+  21 Jul 2003; Martin Schlemmer <azarah@gentoo.org> ttmkfdir-3.0.4.ebuild,
+  ttmkfdir-3.0.9.ebuild, files/ttmkfdir-3.0.9-gcc33.patch:
+  Fix issues with gcc-3.3.
 
 *ttmkfdir-3.0.9 (16 Mar 2003)
 
diff --git a/x11-misc/ttmkfdir/Manifest b/x11-misc/ttmkfdir/Manifest
index b08001accc19..aab198f6cac9 100644
--- a/x11-misc/ttmkfdir/Manifest
+++ b/x11-misc/ttmkfdir/Manifest
@@ -1,14 +1,15 @@
+MD5 af3eb64cc6a2e47a7de9f33059bc7d75 ChangeLog 2408
 MD5 2a9b31af99fcc5a47f1a659615c185f3 ttmkfdir-1.0.ebuild 768
-MD5 aa4d89c1cea6130ad879b0367270b33b ttmkfdir-2.0-r1.ebuild 1080
 MD5 b0ff26a7aca78ec1f51dfedec0d0aa08 ttmkfdir-2.0.ebuild 918
-MD5 f6a6aecbff9a95ddde825bd02543da01 ttmkfdir-3.0.9.ebuild 799
-MD5 a5168d824c75d66298c3a216af19885d ttmkfdir-3.0.4.ebuild 791
-MD5 8633cc4c3ce2a4522aafdbf642c01f36 ChangeLog 2244
+MD5 aa4d89c1cea6130ad879b0367270b33b ttmkfdir-2.0-r1.ebuild 1080
+MD5 4ccaa4ddc197e8644e2beb8cf00a034e ttmkfdir-3.0.4.ebuild 850
+MD5 e3cac3e17fd6676b209ef041460d2de1 ttmkfdir-3.0.9.ebuild 853
+MD5 3e25468c2efed5d98c512a370d4e44b5 files/digest-ttmkfdir-1.0 59
+MD5 214d38ab15000e3cb8a67bf1c68bce73 files/digest-ttmkfdir-2.0 65
+MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
 MD5 e285b7a7c7369e7947c0997de817d3ce files/ttmkfdir-2.0-gentoo.patch 688
-MD5 214d38ab15000e3cb8a67bf1c68bce73 files/digest-ttmkfdir-2.0-r1 65
 MD5 9b84e6d68d388eb67760658ba28d05c8 files/ttmkfdir2-ignore-FIRSTINDEX.patch 440
-MD5 d1defff244ae210e4ba3da97b5443b4c files/ttmkfdir-1.0-gentoo.diff 1190
+MD5 214d38ab15000e3cb8a67bf1c68bce73 files/digest-ttmkfdir-2.0-r1 65
 MD5 504adfa6639ae2434cdafb013912b9da files/digest-ttmkfdir-3.0.4 66
 MD5 8d09eeb49f560873b6b4b85755ce5502 files/digest-ttmkfdir-3.0.9 66
-MD5 3e25468c2efed5d98c512a370d4e44b5 files/digest-ttmkfdir-1.0 59
-MD5 214d38ab15000e3cb8a67bf1c68bce73 files/digest-ttmkfdir-2.0 65
+MD5 2f9cb69179e04e61bd5666c2c4833a36 files/ttmkfdir-3.0.9-gcc33.patch 529
diff --git a/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch
new file mode 100644
index 000000000000..c8f41458003d
--- /dev/null
+++ b/x11-misc/ttmkfdir/files/ttmkfdir-3.0.9-gcc33.patch
@@ -0,0 +1,11 @@
+--- ttmkfdir-3.0.9/ttf.cpp.orig	2003-07-21 23:14:21.000000000 +0200
++++ ttmkfdir-3.0.9/ttf.cpp	2003-07-21 23:15:35.000000000 +0200
+@@ -239,7 +239,7 @@
+ 	for (i = 0; i < n; i++) {
+ 	    if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
+                     std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
+-	            return;
++	            return "invalid";
+             };
+             platform = NamePtr.platform_id;
+             encoding = NamePtr.encoding_id;
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild
index 9d46dade5b7f..13498aef8b32 100644
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild
+++ b/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.4.ebuild,v 1.11 2003/07/20 00:27:06 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.4.ebuild,v 1.12 2003/07/21 21:46:23 azarah Exp $
 
 IUSE=""
 
@@ -19,10 +19,14 @@ DEPEND=">=media-libs/freetype-2.0.8
 	>=sys-devel/flex-2.5.4a-r5
 	sys-devel/libtool"
 
-src_compile() {
-	[ -z "${CXX}" ] && CXX="g++"
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}; epatch ${FILESDIR}/${PN}-3.0.9-gcc33.patch
+}
 
-	make CXX="${CXX}" \
+src_compile() {
+	make CXX="${CXX:=g++}" \
 		OPTFLAGS="${CFLAGS}" DEBUG="" || die
 }
 
diff --git a/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild b/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild
index 17493f063ef9..6fd29ecae592 100644
--- a/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild
+++ b/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.ebuild,v 1.3 2003/04/09 02:41:38 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/ttmkfdir/ttmkfdir-3.0.9.ebuild,v 1.4 2003/07/21 21:46:23 azarah Exp $
 
 IUSE=""
 
@@ -19,10 +19,14 @@ DEPEND=">=media-libs/freetype-2.0.8
 	>=sys-devel/flex-2.5.4a-r5
 	sys-devel/libtool"
 
-src_compile() {
-	[ -z "${CXX}" ] && CXX="g++"
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}; epatch ${FILESDIR}/${P}-gcc33.patch
+}
 
-	make CXX="${CXX}" \
+src_compile() {
+	make CXX="${CXX:=g++}" \
 		OPTFLAGS="${CFLAGS}" DEBUG="" || die
 }