devel/Macaulay2 Macaulay2-0.9.2-gcc4.patch, NONE, 1.1 Macaulay2.spec, 1.5, 1.6

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/devel/Macaulay2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26729

Modified Files:
	Macaulay2.spec 
Added Files:
	Macaulay2-0.9.2-gcc4.patch 
Log Message:
* Thu May 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.2-16
- fix build for GCC 4 (#156223)



Macaulay2-0.9.2-gcc4.patch:

--- NEW FILE Macaulay2-0.9.2-gcc4.patch ---
diff -Nur Macaulay2-0.9.2-orig/Macaulay2/c/compat.h Macaulay2-0.9.2/Macaulay2/c/compat.h
--- Macaulay2-0.9.2-orig/Macaulay2/c/compat.h	2002-01-10 17:46:37.000000000 +0100
+++ Macaulay2-0.9.2/Macaulay2/c/compat.h	2005-05-18 01:13:01.000000000 +0200
@@ -99,7 +99,7 @@
 int open(const char *, int, ...);
 #endif
 
-#ifdef __STDC__
+#if 0
 int close(int);
 int fputs(const char *,FILE *); /* needed  for sunos 4.1 */
 int fprintf(FILE *,const char *,...); /* needed  for sunos 4.1 */
diff -Nur Macaulay2-0.9.2-orig/Macaulay2/e/Elookup.cpp Macaulay2-0.9.2/Macaulay2/e/Elookup.cpp
--- Macaulay2-0.9.2-orig/Macaulay2/e/Elookup.cpp	1999-07-08 19:09:59.000000000 +0200
+++ Macaulay2-0.9.2/Macaulay2/e/Elookup.cpp	2005-05-18 01:15:21.000000000 +0200
@@ -1,12 +1,12 @@
 // Copyright 1999  Michael E. Stillman
 #include "EGB1.hpp"
-int EMonomialLookupTable<egb_elem>::compare(egb_elem *p, egb_elem *q) const
+template<> int EMonomialLookupTable<egb_elem>::compare(egb_elem *p, egb_elem *q) const
 {
   const monomial *m = I.lead_monomial(p->f);
   const monomial *n = I.lead_monomial(q->f);
   return I.compare_monomials(m,n);
 }
-int EMonomialLookupTable<ering_elem>::compare(ering_elem *p, ering_elem *q) const
+template<> int EMonomialLookupTable<ering_elem>::compare(ering_elem *p, ering_elem *q) const
 {
   const monomial *m = I.lead_monomial_of_polynomial(p->f);
   const monomial *n = I.lead_monomial_of_polynomial(q->f);


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/devel/Macaulay2/Macaulay2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Macaulay2.spec	6 Apr 2005 22:10:46 -0000	1.5
+++ Macaulay2.spec	26 May 2005 20:01:10 -0000	1.6
@@ -6,8 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 15%{?dist_tag}
-
+Release: 16%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -23,6 +22,7 @@
 Patch3: Macaulay2-0.9.2-gcc3.patch
 # See http://bugzilla.fedora.us/attachment.cgi?id=877&action=view
 Patch4: Macaulay2-0.9.2-gcc34.patch
+Patch5: Macaulay2-0.9.2-gcc4.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel >= 6.3
@@ -65,7 +65,7 @@
 %patch3 -p1 -b .gcc3
 # fc3/gcc34 fix
 %patch4 -p1 -b .gcc34
-
+%patch5 -p1 -b .gcc4
 
 %build
 %configure  \
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Thu May 26 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.2-16
+- fix build for GCC 4 (#156223)
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt