gcc-3.3 related fix

4 files changed, 54 insertions, 6 deletions

diff --git a/media-gfx/transfig/ChangeLog b/media-gfx/transfig/ChangeLog
index e5a407689ec5..6910be84ce7c 100644
--- a/media-gfx/transfig/ChangeLog
+++ b/media-gfx/transfig/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/transfig
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.7 2003/05/10 17:33:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/ChangeLog,v 1.8 2003/06/24 21:39:32 lu_zero Exp $
+
+  24 Jun 2003; Luca Barbato <lu_zero@gentoo.org> transfig-3.2.4-r1.ebuild:
+  Fixed gcc-3.3 problems.
 
   10 May 2003; Jason Wever <weeve@gentoo.org> transfig-3.2.4-r1.ebuild:
   Added ~sparc to keywords.
diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest
index 62beabf0561d..f31f12690e29 100644
--- a/media-gfx/transfig/Manifest
+++ b/media-gfx/transfig/Manifest
@@ -1,7 +1,8 @@
+MD5 d51fdfff250f457a71feae0d4b6a8b35 ChangeLog 1496
+MD5 50afa532bad053ef4d322e0dbf0e2b30 transfig-3.2.3d-r1.ebuild 1079
+MD5 2703300bf28070082fa65876f897e0e2 transfig-3.2.4-r1.ebuild 1250
 MD5 db86c631cd0071efe757e7ea210f777c files/digest-transfig-3.2.3d-r1 67
-MD5 f9974d3952eb7a7aaef9145c8970f371 files/digest-transfig-3.2.4-r1 66
 MD5 4649eef8f14275cfba64c077532d6aad files/transfig-3.2.3d.patch 1532
 MD5 bc2c5e2e9cd1565c110ccce5786d88b4 files/transfig-3.2.4.patch 1877
-MD5 50afa532bad053ef4d322e0dbf0e2b30 transfig-3.2.3d-r1.ebuild 1079
-MD5 6d65851e2cdc16e0b9b83cfe39db5c47 ChangeLog 1392
-MD5 0052a4f9255dd307d7ddc2d54197668e transfig-3.2.4-r1.ebuild 1083
+MD5 f9974d3952eb7a7aaef9145c8970f371 files/digest-transfig-3.2.4-r1 66
+MD5 71a0fff063c73b598780da48ef56b943 files/transfig-3.2.4-gcc-3.3.patch 1895
diff --git a/media-gfx/transfig/files/transfig-3.2.4-gcc-3.3.patch b/media-gfx/transfig/files/transfig-3.2.4-gcc-3.3.patch
new file mode 100644
index 000000000000..dd9f00a7e5f9
--- /dev/null
+++ b/media-gfx/transfig/files/transfig-3.2.4-gcc-3.3.patch
@@ -0,0 +1,37 @@
+diff -ruN transfig.3.2.4.orig/fig2dev/dev/gensvg.c transfig.3.2.4/fig2dev/dev/gensvg.c
+--- transfig.3.2.4.orig/fig2dev/dev/gensvg.c	2003-06-24 23:13:43.000000000 +0200
++++ transfig.3.2.4/fig2dev/dev/gensvg.c	2003-06-24 23:18:55.000000000 +0200
+@@ -692,16 +692,17 @@
+     if (t->angle != 0) {
+ 	fprintf (tfp, "<g transform=\"translate(%d,%d) rotate(%d)\" >\n",
+ 		 (int) (t->base_x * mag), (int) (t->base_y * mag), degrees (t->angle));
+-	fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\"  font-family=\"%s\" 
+-		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
++	fprintf (tfp, "<text x=\"0\" y=\"0\" fill=\"#%6.6x\" "
++		"font-family=\"%s\" font-style=\"%s\" font-weight=\"%s\" "
++		"font-size=\"%d\" text-anchor=\"%s\" >\n",
+ 		 rgbColorVal (t->color), family[(int) ceil ((t->font + 1) / 4)],
+ 		 (t->font % 2 == 0 ? "normal" : "italic"),
+ 		 (t->font % 4 < 2 ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)),
+ 		 anchor[t->type]);
+     }
+     else
+-	fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  font-family=\"%s\" 
+-		 font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
++	fprintf (tfp, "<text x=\"%d\" y=\"%d\" fill=\"#%6.6x\"  font-family=\"%s\" "
++	"font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\" text-anchor=\"%s\" >\n",
+ 		 (int) (t->base_x * mag), (int) (t->base_y * mag), rgbColorVal (t->color),
+ 		 family[(int) ceil ((t->font + 1) / 4)],
+ 		 (t->font % 2 == 0 ? "normal" : "italic"),
+diff -ruN transfig.3.2.4.orig/fig2dev/fig2dev.h transfig.3.2.4/fig2dev/fig2dev.h
+--- transfig.3.2.4.orig/fig2dev/fig2dev.h	2003-06-24 23:13:43.000000000 +0200
++++ transfig.3.2.4/fig2dev/fig2dev.h	2003-06-24 23:14:31.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <sys/file.h>
+ #include <signal.h>
+ #include <string.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <pwd.h>
+ #include <errno.h>
+ #include <time.h>
diff --git a/media-gfx/transfig/transfig-3.2.4-r1.ebuild b/media-gfx/transfig/transfig-3.2.4-r1.ebuild
index 64f6d36138b0..516597a5c654 100644
--- a/media-gfx/transfig/transfig-3.2.4-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.4-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.4-r1.ebuild,v 1.2 2003/05/10 17:33:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/transfig/transfig-3.2.4-r1.ebuild,v 1.3 2003/06/24 21:39:32 lu_zero Exp $
+
+inherit gcc
 
 MY_P=${P/transfig-/transfig.}
 S=${WORKDIR}/${MY_P}
@@ -20,6 +22,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}.patch
+	#bad way to fix a bad issue
+	if [ "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -ge "3" ]
+	then
+	epatch  ${FILESDIR}/${P}-gcc-3.3.patch
+	fi
 }
 
 src_compile() {