[freefem++] - update to 3.9 - fix compilation with gcc-4.5.1

[Dominik Mierzejewski]

commit 5b685cbcb1d305f5b95d46e1c1e77593fc7ed2f8
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Thu Aug 26 23:05:29 2010 +0200

    - update to 3.9
    - fix compilation with gcc-4.5.1

 .gitignore              |    1 +
 freefem++-compile.patch |   25 +++++++++++++++++++++++++
 freefem++.spec          |    8 +++++++-
 sources                 |    2 +-
 4 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..93cb01d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/freefem++-3.9.tar.gz
diff --git a/freefem++-compile.patch b/freefem++-compile.patch
new file mode 100644
index 0000000..9c7472a
--- /dev/null
+++ b/freefem++-compile.patch
@@ -0,0 +1,25 @@
+diff -up freefem++-3.9/src/femlib/FESpace.cpp.compile freefem++-3.9/src/femlib/FESpace.cpp
+--- freefem++-3.9/src/femlib/FESpace.cpp.compile	2010-06-16 14:33:50.000000000 +0200
++++ freefem++-3.9/src/femlib/FESpace.cpp	2010-08-25 23:20:33.556470169 +0200
+@@ -1774,6 +1774,7 @@ void TypeOfMortarCas1::ConstructionOfNod
+ 
+    */
+    //  typedef
++     typedef R (*funtype)(const FESpace *, const aSubFMortar *, R);
+      //     const Mesh &Th(sm.Vh.Th);
+      const Mortar & M(sm.M);
+      int nl=M.NbLeft();
+@@ -1783,11 +1784,10 @@ void TypeOfMortarCas1::ConstructionOfNod
+      int ldata = 6*nbsm;// 3 gauche+ 3 droite 
+      sm.sm = new aSubFMortar[nbsm];
+      sm.datai = new int [ldata];
+-     sm.dataf = new (R (*[ldata])(const FESpace *,const aSubFMortar *,R))  ;
++     sm.dataf = new funtype[ldata];
+      int *dataDfNumberOFmul=sm.datai;
+      
+-     R (**dataf)(const FESpace *,const aSubFMortar *,R) ;
+-     dataf=sm.dataf;
++     funtype *dataf=sm.dataf;
+      for (int i=0;i<ldata;i++) sm.dataf[i]=0;
+    //  int * data0=sm.data+ldata;
+    //  int * data1=data0+ldata;
diff --git a/freefem++.spec b/freefem++.spec
index 6426d05..3dd303c 100644
--- a/freefem++.spec
+++ b/freefem++.spec
@@ -3,7 +3,7 @@
 
 Summary: PDE solving tool
 Name: freefem++
-Version: 3.8
+Version: 3.9
 Release: 1%{dotpl}%{?dist}
 URL: http://www.freefem.org/ff++/index.htm
 Group: Applications/Engineering
@@ -13,6 +13,7 @@ Patch0: %{name}-rpm.patch
 Patch2: %{name}-name.patch
 Patch3: %{name}-tex.patch
 Patch4: %{name}-ld.patch
+Patch5: %{name}-compile.patch
 License: LGPLv2+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires:	arpack-devel
@@ -84,6 +85,7 @@ This package contains the MPI version of FreeFem++.
 %patch2 -p1
 %patch3 -p1 -b .t
 %patch4 -p1 -b .ld
+%patch5 -p1 -b .compile
 find . -type f -perm 755 \( -name "*.c*" -o -name "*.h*" -o -name "*.edp" \) | xargs chmod 644
 for file in AUTHORS ChangeLog COPYRIGHT COPYING HISTORY ; do
 	iconv -f iso8859-1 -t utf8 -o $file.utf8 $file && \
@@ -167,6 +169,10 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 %{_bindir}/FreeFem++-mpi
 
 %changelog
+* Wed Aug 04 2010 Dominik Mierzejewski <rpm at greysector.net> 3.9-1
+- update to 3.9
+- fix compilation with gcc-4.5.1
+
 * Thu Feb 25 2010 Dominik Mierzejewski <rpm at greysector.net> 3.8-1
 - update to 3.8
 - fix FTBFS (rhbz #564731)
diff --git a/sources b/sources
index 8d0daae..f191103 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 f1accc292794bbafb66e963080f9d15b  FreeFem++.1
-1d042f88c94ca3f8c5af637d9ef447d0  freefem++-3.8.tar.gz
+e0c4a1a553e9da15fc84e9ccf881f06b  freefem++-3.9.tar.gz