Fix ICE building newer fontforges with gcc-3.3.2 on ia64

(Portage version: 2.1-r1)

6 files changed, 30 insertions, 4 deletions

diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog
index 852f89d296b3..2d1f85bebc2e 100644
--- a/media-gfx/fontforge/ChangeLog
+++ b/media-gfx/fontforge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fontforge
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.28 2006/07/04 06:54:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.29 2006/07/11 23:43:07 agriffis Exp $
+
+  11 Jul 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/fontforge-20060406-ia64.patch, fontforge-20060406.ebuild,
+  fontforge-20060408.ebuild, fontforge-20060703.ebuild:
+  Fix ICE building newer fontforges with gcc-3.3.2 on ia64
 
 *fontforge-20060703 (04 Jul 2006)
 
diff --git a/media-gfx/fontforge/files/digest-fontforge-20050502 b/media-gfx/fontforge/files/digest-fontforge-20050502
index 7c70e2de0f3a..bbac95c1f754 100644
--- a/media-gfx/fontforge/files/digest-fontforge-20050502
+++ b/media-gfx/fontforge/files/digest-fontforge-20050502
@@ -1 +1,3 @@
 MD5 6a19fe0e0e6c1d70c49014b1f967b481 fontforge_full-20050502.tgz 4149453
+RMD160 e71b767872dc93311c6f31141b14049a6bd7931f fontforge_full-20050502.tgz 4149453
+SHA256 66a0a85506bc128b69e3ea4e5d450d0e963065e6d423c5cc8281b1fcfe6c63bf fontforge_full-20050502.tgz 4149453
diff --git a/media-gfx/fontforge/files/fontforge-20060406-ia64.patch b/media-gfx/fontforge/files/fontforge-20060406-ia64.patch
new file mode 100644
index 000000000000..0d8cf2fff86d
--- /dev/null
+++ b/media-gfx/fontforge/files/fontforge-20060406-ia64.patch
@@ -0,0 +1,16 @@
+This patch changes nothing of how dumppfa.c works, but allows gcc-3.3.2 to build
+without an ICE on ia64.
+
+11 Jul 2006 agriffis
+
+--- fontforge/dumppfa.c	2006-04-06 13:26:12.000000000 -0400
++++ fontforge/dumppfa.c.new	2006-07-11 19:14:40.000000000 -0400
+@@ -118,7 +118,7 @@
+ 	    /* find some random bytes where at least one of them encrypts to */
+ 	    /*  a non hex character */
+ 	    r = 55665;
+-	    cypher = ( randombytes[0] ^ (r>>8));
++	    cypher = ( randombytes[0] ^ (fed->r>>8));
+ 	    if ( isspace(cypher) )
+ 	goto try_again;
+ 	    if ( cypher<'0' || (cypher>'9' && cypher<'A') || (cypher>'F' && cypher<'a') || cypher>'f' )
diff --git a/media-gfx/fontforge/fontforge-20060406.ebuild b/media-gfx/fontforge/fontforge-20060406.ebuild
index 1bb333c104d5..13ae2cac55f9 100644
--- a/media-gfx/fontforge/fontforge-20060406.ebuild
+++ b/media-gfx/fontforge/fontforge-20060406.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/media-gfx/fontforge/fontforge-20060406.ebuild,v 1.1 2006/04/09 17:46:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060406.ebuild,v 1.2 2006/07/11 23:43:07 agriffis Exp $
 
 inherit flag-o-matic eutils
 
@@ -28,6 +28,7 @@ src_unpack() {
 	sed -i -e 's:ungif:gif:g' configure* || die
 	sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
 	epatch "${FILESDIR}"/${P}-respect-HOME.patch
+	use ia64 && epatch "${FILESDIR}/${PN}-20060406-ia64.patch"
 }
 
 src_compile() {
diff --git a/media-gfx/fontforge/fontforge-20060408.ebuild b/media-gfx/fontforge/fontforge-20060408.ebuild
index fbedfb7604a6..308c8a75d88b 100644
--- a/media-gfx/fontforge/fontforge-20060408.ebuild
+++ b/media-gfx/fontforge/fontforge-20060408.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/media-gfx/fontforge/fontforge-20060408.ebuild,v 1.1 2006/04/12 02:10:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060408.ebuild,v 1.2 2006/07/11 23:43:07 agriffis Exp $
 
 inherit flag-o-matic eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	cd "${S}"
 	sed -i -e 's:ungif:gif:g' configure* || die
 	sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
+	use ia64 && epatch "${FILESDIR}/${PN}-20060406-ia64.patch"
 }
 
 src_compile() {
diff --git a/media-gfx/fontforge/fontforge-20060703.ebuild b/media-gfx/fontforge/fontforge-20060703.ebuild
index 0758ac1c23d8..f935aaed6be2 100644
--- a/media-gfx/fontforge/fontforge-20060703.ebuild
+++ b/media-gfx/fontforge/fontforge-20060703.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/media-gfx/fontforge/fontforge-20060703.ebuild,v 1.1 2006/07/04 06:54:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20060703.ebuild,v 1.2 2006/07/11 23:43:07 agriffis Exp $
 
 inherit flag-o-matic eutils
 
@@ -27,6 +27,7 @@ src_unpack() {
 	cd "${S}"
 	sed -i -e 's:ungif:gif:g' configure* || die
 	sed -i -e 's:"libungif":"libgif":g' gdraw/gimagereadgif.c || die
+	use ia64 && epatch "${FILESDIR}/${PN}-20060406-ia64.patch"
 }
 
 src_compile() {