Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv30095
Modified Files:
gfan.info gfan.patch
Log Message:
backport gfan patches from 10.7
https://sourceforge.net/tracker/?func=detail&atid=414256&aid=3534167&group_id=17203
Index: gfan.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gfan.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gfan.info 14 Jun 2012 14:29:25 -0000 1.2
+++ gfan.info 21 Aug 2012 22:02:36 -0000 1.3
@@ -1,6 +1,6 @@
Package: gfan
Version: 0.5
-Revision: 2
+Revision: 3
Maintainer: Dustin Cartwright <dusti...@users.sourceforge.net>
HomePage: http://home.imf.au.dk/jensen/software/gfan/gfan.html
License: GPL
@@ -21,7 +21,7 @@
Source2-Checksum: SHA1(9ccfc6866384c62c42cc4ccd5cb4d89aa2ddae54)
SourceDirectory: gfan%v
PatchFile: %n.patch
-PatchFile-MD5: 1e15350c3926302944fab209e7d5f183
+PatchFile-MD5: f9aa81f34056ccbf0d9b0bb7286126ad
GCC: 4.0
CompileScript: <<
make gmppath=%p cddpath=%p
Index: gfan.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gfan.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gfan.patch 14 Jun 2012 14:29:25 -0000 1.2
+++ gfan.patch 21 Aug 2012 22:02:36 -0000 1.3
@@ -19,42 +19,6 @@
CDD_INCLUDEOPTIONS = -I $(cddpath)/include
endif
-diff -ru gfan0.5/application.cpp gfan0.5-patched/application.cpp
---- gfan0.5/application.cpp
-+++ gfan0.5-patched/application.cpp
-@@ -547,7 +547,7 @@
- if(strlen(p->name())>0)
- {
- char c[1024];
-- sprintf(c,"ln -s %s%s %s%s%s\n",path,name,path,name,p->name());
-+ sprintf(c,"ln -s %s %s%s%s\n",name,path,name,p->name());
- fprintf(stderr,"%s",c);
- system(c);
- }
-diff -ru gfan0.5/testsuite/0056WeildDivisor/command
gfan0.5-patched/testsuite/0056WeildDivisor/command
---- gfan0.5/testsuite/0056WeildDivisor/command
-+++ gfan0.5-patched/testsuite/0056WeildDivisor/command
-@@ -1 +1 @@
--%s _tropicalhypersurface >temp1.poly ; %s _tropicalweildivisor -i1 temp1.poly
-i2 func.poly > temp2.poly ; %s _tropicalweildivisor -i1 temp2.poly -i2
func.poly | grep MULTIPLICITIES -A1
-+%s _tropicalhypersurface >temp1.poly ; %s _tropicalweildivisor -i1 temp1.poly
-i2 testsuite/0056WeildDivisor/func.poly > temp2.poly ; %s _tropicalweildivisor
-i1 temp2.poly -i2 testsuite/0056WeildDivisor/func.poly | grep MULTIPLICITIES
-A1
-diff -ru gfan0.5/testsuite/0507InitialIdeal/command
gfan0.5-patched/testsuite/0507InitialIdeal/command
---- gfan0.5/testsuite/0507InitialIdeal/command
-+++ gfan0.5-patched/testsuite/0507InitialIdeal/command
-@@ -1 +1 @@
--gfan _overintegers --initialIdeal -m
-+%s _overintegers --initialIdeal -m
-diff -ru gfan0.5/testsuite/0508IntegerGroebnerCone/command
gfan0.5-patched/testsuite/0508IntegerGroebnerCone/command
---- gfan0.5/testsuite/0508IntegerGroebnerCone/command
-+++ gfan0.5-patched/testsuite/0508IntegerGroebnerCone/command
-@@ -1 +1 @@
--gfan _overintegers --groebnerCone | grep N_RAYS -v | grep RAYS -A3 | sort
-+%s _overintegers --groebnerCone | grep N_RAYS -v | grep RAYS -A3 | sort
-diff -ru gfan0.5/testsuite/0509IntegerGroebnerFan/command
gfan0.5-patched/testsuite/0509IntegerGroebnerFan/command
---- gfan0.5/testsuite/0509IntegerGroebnerFan/command
-+++ gfan0.5-patched/testsuite/0509IntegerGroebnerFan/command
-@@ -1 +1 @@
--gfan _overintegers --groebnerFan |grep F_VECTOR
-+%s _overintegers --groebnerFan |grep F_VECTOR
diff -ru gfan0.5/app_intsinpolytope.cpp gfan0.5-patched/app_intsinpolytope.cpp
--- gfan0.5/app_intsinpolytope.cpp
+++ gfan0.5-patched/app_intsinpolytope.cpp
@@ -88,6 +52,17 @@
bool isGroebnerBasis=false;
int counter=0;
+diff -ru gfan0.5/app_minkowski.cpp gfan0.5-patched/app_minkowski.cpp
+--- gfan0.5/app_minkowski.cpp
++++ gfan0.5-patched/app_minkowski.cpp
+@@ -160,7 +160,6 @@
+ //log0 fprintf(Stderr,"4");
+ f.insert(c);
+ //log0 fprintf(Stderr,"5\n");
+- static int i;
+ //log0 fprintf(Stderr,"inserted:%i\n",++i);
+ }
+ log1 fprintf(Stderr,"Resolving symmetries.\n");
diff -ru gfan0.5/app_normalfancleanup.cpp
gfan0.5-patched/app_normalfancleanup.cpp
--- gfan0.5/app_normalfancleanup.cpp
+++ gfan0.5-patched/app_normalfancleanup.cpp
@@ -154,6 +129,18 @@
log1 fprintf(Stderr,"Number of maximal cones:
%i\n",f.numberOfMaximalCones());
log1 fprintf(Stderr,"Modulo the homogeneity space:\n");
log1 AsciiPrinter(Stderr).printVectorList(hv);
+diff -ru gfan0.5/application.cpp gfan0.5-patched/application.cpp
+--- gfan0.5/application.cpp
++++ gfan0.5-patched/application.cpp
+@@ -547,7 +547,7 @@
+ if(strlen(p->name())>0)
+ {
+ char c[1024];
+- sprintf(c,"ln -s %s%s %s%s%s\n",path,name,path,name,p->name());
++ sprintf(c,"ln -s %s %s%s%s\n",name,path,name,p->name());
+ fprintf(stderr,"%s",c);
+ system(c);
+ }
diff -ru gfan0.5/bergman.cpp gfan0.5-patched/bergman.cpp
--- gfan0.5/bergman.cpp
+++ gfan0.5-patched/bergman.cpp
@@ -255,6 +242,17 @@
return intersection;
}
+diff -ru gfan0.5/linalgfloat.h gfan0.5-patched/linalgfloat.h
+--- gfan0.5/linalgfloat.h
++++ gfan0.5-patched/linalgfloat.h
+@@ -13,6 +13,7 @@
+
+ namespace linalgfloat
+ {
++class Matrix;
+ class Vector{
+ int n;
+ std::vector<typ> data;
diff -ru gfan0.5/lp_cdd.cpp gfan0.5-patched/lp_cdd.cpp
--- gfan0.5/lp_cdd.cpp
+++ gfan0.5-patched/lp_cdd.cpp
@@ -323,6 +321,30 @@
P.printString("Done printing SymmetryGroup.\n");
}
+diff -ru gfan0.5/testsuite/0056WeildDivisor/command
gfan0.5-patched/testsuite/0056WeildDivisor/command
+--- gfan0.5/testsuite/0056WeildDivisor/command
++++ gfan0.5-patched/testsuite/0056WeildDivisor/command
+@@ -1 +1 @@
+-%s _tropicalhypersurface >temp1.poly ; %s _tropicalweildivisor -i1 temp1.poly
-i2 func.poly > temp2.poly ; %s _tropicalweildivisor -i1 temp2.poly -i2
func.poly | grep MULTIPLICITIES -A1
++%s _tropicalhypersurface >temp1.poly ; %s _tropicalweildivisor -i1 temp1.poly
-i2 testsuite/0056WeildDivisor/func.poly > temp2.poly ; %s _tropicalweildivisor
-i1 temp2.poly -i2 testsuite/0056WeildDivisor/func.poly | grep MULTIPLICITIES
-A1
+diff -ru gfan0.5/testsuite/0507InitialIdeal/command
gfan0.5-patched/testsuite/0507InitialIdeal/command
+--- gfan0.5/testsuite/0507InitialIdeal/command
++++ gfan0.5-patched/testsuite/0507InitialIdeal/command
+@@ -1 +1 @@
+-gfan _overintegers --initialIdeal -m
++%s _overintegers --initialIdeal -m
+diff -ru gfan0.5/testsuite/0508IntegerGroebnerCone/command
gfan0.5-patched/testsuite/0508IntegerGroebnerCone/command
+--- gfan0.5/testsuite/0508IntegerGroebnerCone/command
++++ gfan0.5-patched/testsuite/0508IntegerGroebnerCone/command
+@@ -1 +1 @@
+-gfan _overintegers --groebnerCone | grep N_RAYS -v | grep RAYS -A3 | sort
++%s _overintegers --groebnerCone | grep N_RAYS -v | grep RAYS -A3 | sort
+diff -ru gfan0.5/testsuite/0509IntegerGroebnerFan/command
gfan0.5-patched/testsuite/0509IntegerGroebnerFan/command
+--- gfan0.5/testsuite/0509IntegerGroebnerFan/command
++++ gfan0.5-patched/testsuite/0509IntegerGroebnerFan/command
+@@ -1 +1 @@
+-gfan _overintegers --groebnerFan |grep F_VECTOR
++%s _overintegers --groebnerFan |grep F_VECTOR
diff -ru gfan0.5/xfig.cpp gfan0.5-patched/xfig.cpp
--- gfan0.5/xfig.cpp
+++ gfan0.5-patched/xfig.cpp
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
