Fix for gcc 4.1, closing bug #131048.

Package-Manager: portage-2.0.54-r2

5 files changed, 86 insertions, 5 deletions

diff --git a/sci-electronics/spice/ChangeLog b/sci-electronics/spice/ChangeLog
index 5f6931270fa3..adfa50d557ad 100644
--- a/sci-electronics/spice/ChangeLog
+++ b/sci-electronics/spice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/spice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/ChangeLog,v 1.3 2006/01/22 16:40:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/ChangeLog,v 1.4 2006/05/21 20:25:25 calchan Exp $
+
+  21 May 2006; Denis Dupeyron <calchan@gentoo.org>
+  +files/spice-3.5.5-gcc-4.1.patch, metadata.xml, spice-3.5.5.ebuild:
+  Fix for gcc 4.1, closing bug #131048.
 
   22 Jan 2006; Markus Dittrich <markusle@gentoo.org> spice-3.5.5.ebuild:
   Fixed dependencies for modular X.
diff --git a/sci-electronics/spice/Manifest b/sci-electronics/spice/Manifest
index 9fd880c5932a..2036bbfc90a0 100644
--- a/sci-electronics/spice/Manifest
+++ b/sci-electronics/spice/Manifest
@@ -1,4 +1,5 @@
-MD5 c650bc4fe2f4a47f383010daa922c182 ChangeLog 1718
+MD5 6297cee9b3ba6fa7139d1f42be14f9a2 ChangeLog 1879
 MD5 95e9084323d2adf97b66193093ed2262 files/digest-spice-3.5.5 65
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 ae1b6083ec8a0ea5ce8ea43bb70c59a6 spice-3.5.5.ebuild 1335
+MD5 490bbc3ce696fc903a2ddedd19ad6fe7 files/spice-3.5.5-gcc-4.1.patch 2511
+MD5 cefa75b0a06053277ea938f4e4fdd6e5 metadata.xml 219
+MD5 a583e1bd7d4a6d91ccb58b46f9bec0ce spice-3.5.5.ebuild 1398
diff --git a/sci-electronics/spice/files/spice-3.5.5-gcc-4.1.patch b/sci-electronics/spice/files/spice-3.5.5-gcc-4.1.patch
new file mode 100644
index 000000000000..aea002d372c9
--- /dev/null
+++ b/sci-electronics/spice/files/spice-3.5.5-gcc-4.1.patch
@@ -0,0 +1,69 @@
+diff -Nadurp spice3f5sfix.orig/src/lib/fte/graf.c spice3f5sfix/src/lib/fte/graf.c
+--- spice3f5sfix.orig/src/lib/fte/graf.c	1999-06-11 14:38:56.000000000 +0200
++++ spice3f5sfix/src/lib/fte/graf.c	2006-05-21 21:49:52.000000000 +0200
+@@ -52,6 +52,9 @@ double *readtics();
+ #define XFACTOR 2       /* How much to expand the X scale during iplot. */
+ #define YFACTOR 1.5     /* How much to expand the Y scale during iplot. */
+ 
++static drawlegend();
++static gr_resize_internal();
++
+ /*
+  *  Start of a new graph.
+  *  Fill in the data that gets displayed.
+diff -Nadurp spice3f5sfix.orig/src/lib/fte/grid.c spice3f5sfix/src/lib/fte/grid.c
+--- spice3f5sfix.orig/src/lib/fte/grid.c	1999-05-30 09:14:12.000000000 +0200
++++ spice3f5sfix/src/lib/fte/grid.c	2006-05-21 21:49:52.000000000 +0200
+@@ -34,6 +34,9 @@ typedef enum { x_axis, y_axis } Axis;
+     ie, can get rid of it */
+ static bool scaleunits = true;
+ 
++static drawlingrid();
++static drawloggrid();
++
+ void
+ gr_fixgrid(graph, xdelta, ydelta, xtype, ytype)
+     GRAPH *graph;
+diff -Nadurp spice3f5sfix.orig/src/lib/fte/x11.c spice3f5sfix/src/lib/fte/x11.c
+--- spice3f5sfix.orig/src/lib/fte/x11.c	1999-06-19 14:09:37.000000000 +0200
++++ spice3f5sfix/src/lib/fte/x11.c	2006-05-21 21:50:35.000000000 +0200
+@@ -81,6 +81,10 @@ static GRAPH *lasthardcopy; /* graph use
+ static int X11_Open = 0;
+ static int numdispplanes;
+ 
++static initlinestyles();
++static initcolors();
++static X_ScreentoData();
++
+ X11_Init()
+ {
+ 
+diff -Nadurp spice3f5sfix.orig/src/lib/hlp/readhelp.c spice3f5sfix/src/lib/hlp/readhelp.c
+--- spice3f5sfix.orig/src/lib/hlp/readhelp.c	1993-06-17 23:32:43.000000000 +0200
++++ spice3f5sfix/src/lib/hlp/readhelp.c	2006-05-21 21:49:52.000000000 +0200
+@@ -41,8 +41,8 @@ Author: 1986 Wayne A. Christopher, U. C.
+ 
+ static char *getsubject();
+ static toplink *getsubtoplink();
+-extern void sortlist(), tlfree();
+-extern int sortcmp();
++static void sortlist(), tlfree();
++static int sortcmp();
+ 
+ static topic *alltopics = NULL;
+ 
+diff -Nadurp spice3f5sfix.orig/src/lib/mfb/mfbcaps.c spice3f5sfix/src/lib/mfb/mfbcaps.c
+--- spice3f5sfix.orig/src/lib/mfb/mfbcaps.c	1993-06-17 23:34:25.000000000 +0200
++++ spice3f5sfix/src/lib/mfb/mfbcaps.c	2006-05-21 21:49:52.000000000 +0200
+@@ -43,9 +43,9 @@ static int hopcount;       /* detect inf
+ 
+ FILE   *POpen();
+ char   *strcpy();
+-char   *MFBSkip();
++static char   *MFBSkip();
+ char   *MFBGetStr();
+-char   *MFBCapDecod();
++static char   *MFBCapDecod();
+ int    MFBGetNum();
+ int    MFBGetFlag();
+ int    MFBGetEnt();
diff --git a/sci-electronics/spice/metadata.xml b/sci-electronics/spice/metadata.xml
index b229aec85b8f..a97d56ec20bb 100644
--- a/sci-electronics/spice/metadata.xml
+++ b/sci-electronics/spice/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<maintainer>
+  <email>calchan@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/sci-electronics/spice/spice-3.5.5.ebuild b/sci-electronics/spice/spice-3.5.5.ebuild
index d83a380de28c..6cf5112399b4 100644
--- a/sci-electronics/spice/spice-3.5.5.ebuild
+++ b/sci-electronics/spice/spice-3.5.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/spice-3.5.5.ebuild,v 1.2 2006/01/22 16:40:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/spice/spice-3.5.5.ebuild,v 1.3 2006/05/21 20:25:25 calchan Exp $
+
+inherit eutils
 
 IUSE=""
 
@@ -32,6 +34,8 @@ src_unpack() {
 		-e "s:SPICE_DIR)/lib:SPICE_DIR)/lib/spice:g" \
 		-e "s:/usr/local/spice:/usr:g" \
 		-i.orig linux
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc-4.1.patch
 }
 
 src_compile() {