rpms/freefem++/F-7 freefem++-gcc43.patch, NONE, 1.1 freefem++-rpm.patch, NONE, 1.1 freefem++.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Fri Feb 22 18:59:22 UTC 2008
Author: rathann
Update of /cvs/pkgs/rpms/freefem++/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25452
Modified Files:
.cvsignore sources
Added Files:
freefem++-gcc43.patch freefem++-rpm.patch freefem++.spec
Log Message:
- import into F-7 branch
freefem++-gcc43.patch:
--- NEW FILE freefem++-gcc43.patch ---
diff -up freefem++-2.23/src/Graphics/getprog-unix.hpp.gcc43 freefem++-2.23/src/Graphics/getprog-unix.hpp
--- freefem++-2.23/src/Graphics/getprog-unix.hpp.gcc43 2007-12-11 22:37:39.000000000 +0100
+++ freefem++-2.23/src/Graphics/getprog-unix.hpp 2008-02-20 21:50:16.000000000 +0100
@@ -1,3 +1,4 @@
+#include <cstring>
extern long verbosity;
diff -up freefem++-2.23/src/Graphics/sansrgraph.cpp.gcc43 freefem++-2.23/src/Graphics/sansrgraph.cpp
diff -up freefem++-2.23/src/Algo/LineSearch.hpp.gcc43 freefem++-2.23/src/Algo/LineSearch.hpp
--- freefem++-2.23/src/Algo/LineSearch.hpp.gcc43 2006-04-03 19:23:33.000000000 +0200
+++ freefem++-2.23/src/Algo/LineSearch.hpp 2008-02-21 17:39:08.000000000 +0100
@@ -30,7 +30,7 @@ public:
typedef M Mat;
typedef P Param;
typedef V Vect;
- typedef NRJ<Param,Vect,VMat,Real> NRJ;
+ typedef NRJ<Param,Vect,VMat,Real> lsNRJ;
private:
//ne sert que si on calcule le gradient de manière numérique
@@ -57,7 +57,7 @@ protected:
// c'est du meme type que le gradient
Vect* step;
//pointer to the nrj
- NRJ * nrj;
+ lsNRJ * nrj;
void appendSearchNumber();
@@ -65,7 +65,7 @@ public:
//a constructor with pointer to the nrj and
//to the step if numerical gradient is computed
- LineSearch(NRJ* f,Vect* interval = NULL);
+ LineSearch(lsNRJ* f,Vect* interval = NULL);
virtual ~LineSearch();
// point de départ et direction de descente + des paramètres
@@ -92,7 +92,7 @@ public:
};
template <class P, class V,class M,class VM,class R>
-LineSearch<P,V,M,VM,R>::LineSearch(NRJ* p, Vect* interval )
+LineSearch<P,V,M,VM,R>::LineSearch(lsNRJ* p, Vect* interval )
{
iterMax = MAX_IT_LS;
iterNum = 0;
diff -up freefem++-2.23/src/Algo/CubicLS.hpp.gcc43 freefem++-2.23/src/Algo/CubicLS.hpp
--- freefem++-2.23/src/Algo/CubicLS.hpp.gcc43 2006-04-03 19:23:32.000000000 +0200
+++ freefem++-2.23/src/Algo/CubicLS.hpp 2008-02-21 17:39:08.000000000 +0100
@@ -31,12 +31,12 @@ class CubicLineSearch : public LS
typedef typename LS::Vect Vect;
typedef typename LS::VMat VMat;
typedef LS LineSearch;
- typedef NRJ<Param,Vect,VMat,Real> NRJ;
+ typedef NRJ<Param,Vect,VMat,Real> clsNRJ;
public:
//a constructor with the default delta
- CubicLineSearch(NRJ* f, int iter);
+ CubicLineSearch(clsNRJ* f, int iter);
//a constructor with the specified delta
- CubicLineSearch(NRJ* f, int iter, Vect* delta);
+ CubicLineSearch(clsNRJ* f, int iter, Vect* delta);
/* The parameter $delta$ is not used by the line search
itself. Rather it is used in the numerical computation
of the derivatives using centered differences. For
@@ -65,13 +65,13 @@ public:
};
template <class LS>
-CubicLineSearch<LS>::CubicLineSearch(NRJ* f, int it)
+CubicLineSearch<LS>::CubicLineSearch(clsNRJ* f, int it)
: LS(f)
{ this->iterMax = it;
}
template <class LS>
-CubicLineSearch<LS>::CubicLineSearch(NRJ* f, int it, Vect* interval)
+CubicLineSearch<LS>::CubicLineSearch(clsNRJ* f, int it, Vect* interval)
: LS(f,interval)
{ this->iterMax = it;
}
diff -up freefem++-2.23/src/ide/testhighlight.cpp.gcc43 freefem++-2.23/src/ide/testhighlight.cpp
--- freefem++-2.23/src/ide/testhighlight.cpp.gcc43 2007-04-20 17:18:59.000000000 +0200
+++ freefem++-2.23/src/ide/testhighlight.cpp 2008-02-21 17:39:08.000000000 +0100
@@ -33,6 +33,7 @@ using namespace std;
#include "hl_lexyacc.hpp"
#include <iostream>
#include <fstream>
+#include <cstdlib>
extern int yydebug;
diff -up freefem++-2.23/src/ide/highlight.cpp.gcc43 freefem++-2.23/src/ide/highlight.cpp
--- freefem++-2.23/src/ide/highlight.cpp.gcc43 2006-09-29 22:30:15.000000000 +0200
+++ freefem++-2.23/src/ide/highlight.cpp 2008-02-21 17:39:08.000000000 +0100
@@ -31,6 +31,7 @@
#include <iostream>
#include <cassert>
+#include <cstring>
using namespace std;
#include "highlight.hpp"
#include "hl_lexyacc.hpp"
diff -up freefem++-2.23/src/ide/commands.cpp.gcc43 freefem++-2.23/src/ide/commands.cpp
--- freefem++-2.23/src/ide/commands.cpp.gcc43 2006-09-25 17:36:43.000000000 +0200
+++ freefem++-2.23/src/ide/commands.cpp 2008-02-21 17:39:08.000000000 +0100
@@ -32,6 +32,7 @@
// together, or through sockets if they are separated.
#include <FL/Fl.H>
+#include <cstdlib>
#include "commands.hpp"
#include "editor.hpp"
#include "draw.hpp"
diff -up freefem++-2.23/src/ide/socket.cpp.gcc43 freefem++-2.23/src/ide/socket.cpp
--- freefem++-2.23/src/ide/socket.cpp.gcc43 2006-09-29 22:30:15.000000000 +0200
+++ freefem++-2.23/src/ide/socket.cpp 2008-02-21 17:39:08.000000000 +0100
@@ -33,6 +33,7 @@
#include <iostream>
#include <cassert>
+#include <cstring>
#include "socket.hpp"
using namespace std;
diff -up freefem++-2.23/src/ide/spawn.cpp.gcc43 freefem++-2.23/src/ide/spawn.cpp
--- freefem++-2.23/src/ide/spawn.cpp.gcc43 2006-09-29 22:30:15.000000000 +0200
+++ freefem++-2.23/src/ide/spawn.cpp 2008-02-21 17:39:08.000000000 +0100
@@ -35,6 +35,7 @@
#define SPAWN_HPP
#include <iostream>
+#include <cstdlib>
using namespace std;
#include <cassert>
#include <FL/Fl.H>
diff -up freefem++-2.23/src/fflib/Serialize.hpp.gcc43 freefem++-2.23/src/fflib/Serialize.hpp
--- freefem++-2.23/src/fflib/Serialize.hpp.gcc43 2008-01-13 11:17:49.000000000 +0100
+++ freefem++-2.23/src/fflib/Serialize.hpp 2008-02-20 20:57:33.000000000 +0100
@@ -28,6 +28,8 @@
#ifndef SERIALEZE_HPP_
#define SERIALEZE_HPP_
+#include <cstring>
+
struct MPIrank;
class Serialize {
// we store a refcounter in the pointer p a adresse p-sizeof(long)
diff -up freefem++-2.23/src/femlib/fem.hpp.gcc43 freefem++-2.23/src/femlib/fem.hpp
--- freefem++-2.23/src/femlib/fem.hpp.gcc43 2008-01-17 18:00:42.000000000 +0100
+++ freefem++-2.23/src/femlib/fem.hpp 2008-02-21 17:39:57.000000000 +0100
@@ -5,6 +5,7 @@
#include "Serialize.hpp"
// some usefull function
+#include <algorithm>
template<class K> class KN_;
@@ -132,7 +133,6 @@ inline R2 Maxc(const R3 & A,const R3& B,
// def de numerotation dans un triangles direct sens (trigo)
// the edge is oposite of the vertex
//// [3] is a edge
-#include <algorithm>
//#include <Functional>
struct SortedTriplet {
static const int empty = -1;
diff -up freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp.gcc43 freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp
--- freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp.gcc43 2007-12-12 18:12:37.000000000 +0100
+++ freefem++-2.23/src/femlib/MatriceCreuse_tpl.hpp 2008-02-20 19:37:28.000000000 +0100
@@ -4,6 +4,7 @@
#include <set>
#include <list>
#include <map>
+#include <limits>
#endif
#ifndef __MWERKS__
freefem++-rpm.patch:
--- NEW FILE freefem++-rpm.patch ---
diff -up freefem++-2.22/src/Carbon.r freefem++-2.22/src/Carbon
diff -up freefem++-2.22/src/lglib/Makefile.am.r freefem++-2.22/src/lglib/Makefile.am
--- freefem++-2.22/src/lglib/Makefile.am.r 2006-04-10 22:51:52.000000000 +0200
+++ freefem++-2.22/src/lglib/Makefile.am 2008-01-02 00:37:59.000000000 +0100
@@ -9,9 +9,9 @@ INCLUDES=-I../fflib -I../bamglib -I../Gr
BUILT_SOURCES=lg.tab.hpp lg.tab.cpp
lg.tab.hpp lg.tab.cpp: lg.y
- -rm lg.tab.hpp lg.tab.cpp lg.tab.cpp.h
+ -rm -f lg.tab.hpp lg.tab.cpp lg.tab.cpp.h
bison -dtv -p lg $< -o lg.tab.cpp
- -mv lg.tab.cpp.h lg.tab.hpp # pour un pb entre des versions de bison
+ -mv -f lg.tab.cpp.h lg.tab.hpp
libfreefem++.dylib: lg.tab.o ../fflib/libff.a
g++ -bundle lg.tab.o ../fflib/libff.a $(UMFPACKLIB) $(ARPACKLIB) $(BLASLIB) $(LIBS) -o libfreefem++.dylib
EXTRA_DIST=lg.y
diff -up freefem++-2.22/Makefile.am.r freefem++-2.22/Makefile.am
--- freefem++-2.22/Makefile.am.r 2007-11-18 13:20:20.000000000 +0100
+++ freefem++-2.22/Makefile.am 2008-01-02 00:37:59.000000000 +0100
@@ -7,7 +7,7 @@
# $Id: Makefile.am,v 1.91 2007/11/18 12:20:20 hecht Exp $
SUBDIRS=download src DOC examples++-tutorial examples++ \
- examples++-eigen examples++-load examples++-mpi \
+ examples++-eigen examples++-mpi \
examples++-bug examples++-chapt3 examples++-other
EXTRA_DIST=regtests.sh config-wrapper.h \
diff -up freefem++-2.22/configure.ac.r freefem++-2.22/configure.ac
--- freefem++-2.22/configure.ac.r 2007-12-18 16:43:52.000000000 +0100
+++ freefem++-2.22/configure.ac 2008-01-02 00:39:42.000000000 +0100
@@ -307,10 +307,7 @@ ff_x11=no
if test "$ff_mingw" = no && test "$with_x" != "no";
then
- if test -d /usr/X11R6
- then
ff_x11=yes
- fi
fi
AC_MSG_RESULT($ff_x11)
diff -up freefem++-2.22/examples++-load/load.link.r freefem++-2.22/examples++-load/load.link
--- freefem++-2.22/examples++-load/load.link.r 2007-11-13 16:40:13.000000000 +0100
+++ freefem++-2.22/examples++-load/load.link 2008-01-02 00:37:59.000000000 +0100
@@ -128,9 +128,9 @@ if [ -n "$files$fileso" ] ; then
exit 1;
fi
if [ "$files" ] ;then
- echo $CXX -c $FLAGS $INC $PIC $files
+ echo $CXX -c $FLAGS $CXXFLAGS $INC $PIC $files
if [ $do = yes ] ; then
- $CXX -c $INC $FLAGS $PIC $files
+ $CXX -c $INC $FLAGS $CXXFLAGS $PIC $files
ret=$?; if [ $ret -ne 0 ] ; then exit $ret ;fi
fi
fi
--- NEW FILE freefem++.spec ---
Summary: PDE solving tool
Name: freefem++
Version: 2.24
Release: 2%{?dist}
URL: http://www.freefem.org/ff++/index.htm
Group: Applications/Engineering
Source0: http://www.freefem.org/ff++/ftp/%{name}-%{version}.tar.gz
Source1: FreeFem++.1
Patch0: %{name}-rpm.patch
Patch1: %{name}-gcc43.patch
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: arpack-devel
BuildRequires: atlas-devel
BuildRequires: automake
BuildRequires: bison
BuildRequires: fftw-devel
BuildRequires: flex
BuildRequires: fltk-devel
BuildRequires: gcc-gfortran
BuildRequires: ImageMagick
BuildRequires: lapack-devel
BuildRequires: libGLU-devel
BuildRequires: libXpm-devel
BuildRequires: libXxf86vm-devel
BuildRequires: lam-devel
BuildRequires: ufsparse-devel
BuildRequires: %{_bindir}/dvips
BuildRequires: %{_bindir}/epstopdf
BuildRequires: %{_bindir}/pdflatex
%description
A PDE oriented language using Finite Element Method FreeFem++ is an
implementation of a language dedicated to the finite element method. It
provides you a way to solve Partial Differential Equations (PDE) simply.
Problems involving partial differential equations (pde) of several
branches of physics such as fluid-structure interactions require
interpolations of data on several meshes and their manipulation within
one program.
FreeFem++ is an extension of freefem, freefem+ written in C++.
Homepage: http://www.freefem.org/
%package glx
Summary: PDE solving tool - OpenGL version
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
%description glx
This package contains the OpenGL version of FreeFem++.
%package mpi
Summary: PDE solving tool - MPI version
Group: Applications/Engineering
Requires: %{name} = %{version}-%{release}
%description mpi
This package contains the MPI version of FreeFem++.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .r
%patch1 -p1 -b .gcc43
chmod -x src/fflib/mt19937ar.cpp
chmod -x src/lglib/mymain.cpp
%build
autoreconf
#sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
#CPPFLAGS="`pkg-config --cflags lam`"
#export CPPFLAGS
%configure \
--with-x \
--with-blas="-L%{_libdir}/atlas -llapack -lf77blas -lcblas -latlas" \
--with-mpi=mpic++
%{__make} CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%{__make} documentation
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
install -d $RPM_BUILD_ROOT%{_mandir}/man1/
install -pm644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
%clean
rm -rf $RPM_BUILD_ROOT
#%%check
#%{__make} check
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING COPYRIGHT ChangeLog HISTORY HISTORY_BEFORE_2005
%doc INNOVATION README* TODO
%doc DOC/freefem++doc.pdf
%{_mandir}/man1/*
%{_bindir}/FreeFem++
%{_bindir}/FreeFem++-client
%{_bindir}/FreeFem++-cs
%{_bindir}/FreeFem++-ide
%{_bindir}/FreeFem++-nw
%{_bindir}/FreeFem++-server
%{_bindir}/bamg
%{_bindir}/cvmsh2
%{_bindir}/drawbdmesh
%files glx
%defattr(-,root,root,-)
%{_bindir}/FreeFem++-glx
%files mpi
%defattr(-,root,root,-)
%{_bindir}/FreeFem++-mpi
%changelog
* Fri Feb 22 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-2
- fix build on ppc64
* Fri Feb 22 2008 Dominik Mierzejewski <rpm at greysector.net> 2.24-1
- updated to 2.24
* Wed Feb 20 2008 Dominik Mierzejewski <rpm at greysector.net> 2.23-1
- updated to 2.23
- fixed build with gcc-4.3 (with help from Denis Leroy)
- use file deps for latex tools
- MPI part doesn't build on ppc64 (bug #433870)
* Sun Apr 29 2007 Dominik Mierzejewski <rpm at greysector.net> 2.16-2
- enable testsuite
- remove load tests from testsuite, the rest completes fine
* Sat Apr 28 2007 Dominik Mierzejewski <rpm at greysector.net> 2.16-1
- updated to 2.16-2
- simplified defattr
- work around X11 "detection"
- work around lam's mpicxx.h misdetection in configure
* Tue Mar 27 2007 Dominik Mierzejewski <rpm at greysector.net> 2.14-2
- updated to 2.14-2
* Mon Mar 19 2007 Dominik Mierzejewski <rpm at greysector.net> 2.14-1
- updated to 2.14-1
- removed redundant builddeps
* Thu Nov 23 2006 Dominik Mierzejewski <rpm at greysector.net> 2.11-2
- specfile cleanups
- added manpage from CVS
* Fri Nov 17 2006 Dominik Mierzejewski <rpm at greysector.net> 2.11-1
- updated to 2.11
- specfile cleanups
* Tue Jun 27 2006 Dominik Mierzejewski <rpm at greysector.net>
- updated to latest CVS
* Mon May 15 2006 Dominik Mierzejewski <rpm at greysector.net>
- split into subpackages
* Wed Apr 26 2006 Dominik Mierzejewski <rpm at greysector.net>
- initial build
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 1 Jan 2008 23:09:23 -0000 1.1
+++ .cvsignore 22 Feb 2008 18:58:48 -0000 1.2
@@ -0,0 +1,2 @@
+FreeFem++.1
+freefem++-2.24.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/freefem++/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 1 Jan 2008 23:09:23 -0000 1.1
+++ sources 22 Feb 2008 18:58:48 -0000 1.2
@@ -0,0 +1,2 @@
+f1accc292794bbafb66e963080f9d15b FreeFem++.1
+3acf5bf86d2156d7aa53be86b6413e7c freefem++-2.24.tar.gz
More information about the fedora-extras-commits
mailing list