Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv12144/10.4/stable/main/finkinfo/sci
Modified Files:
gmsh.info gmsh2.5.0-shlibs.info
Added Files:
gmsh-2.6.0.info
Log Message:
New upstream which fixes some the stuff I've been patching. Yay!
Index: gmsh.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gmsh.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gmsh.info 16 Jul 2012 17:34:49 -0000 1.6
+++ gmsh.info 17 Jul 2012 19:14:19 -0000 1.7
@@ -1,6 +1,6 @@
Package: gmsh
-Version: 2.6.0
-Revision: 2
+Version: 2.6.1
+Revision: 1
Depends: <<
fltk13-aqua-shlibs,
@@ -23,7 +23,7 @@
<<
Source: http://www.geuz.org/%n/src/%n-%v-source.tgz
-Source-MD5: 404fc5ad6194b959c72ec9b0d9b190e7
+Source-MD5: 815511cad883db20b966ba0f773ab339
SourceDirectory: %n-%v-source
GCC: 4.0
@@ -33,7 +33,6 @@
PatchScript: <<
%{default_script}
perl -pi -e 's|-framework vecLib|-framework Accelerate|' CMakeLists.txt
- perl -pi -e 's|end\+|begin_+|g' contrib/gmm/gmm_interface.h
perl -pi -e 's|return;|return NULL;|'
contrib/mmg3d/build/sources/ratio.c
<<
@@ -122,12 +121,6 @@
Patch contrib/mmg3d/build/sources/ratio.c where a non-void function has
a
return without a value.
- There appears to be something awry in contrib/gmm/gmm_interface.h .
- clang from Xcode 4.3 decided that there was an error, and by inspection
there
- appears indeed to be one. I implemented a patch which seemed to be
correct in
- context.
- This file is currently still unchanged in upstream's SVN.
-
Uses vecLib for BLAS. (we patch this to Accelerate)
It appears not to use Fink's ATLAS even when that's
installed, so no -atlas variant currently.
@@ -136,18 +129,18 @@
Fink Pythons.
<<
SplitOff: <<
- Package: %N2.6.0-shlibs
+ Package: %N2.6.1-shlibs
Files: lib/libGmsh.%v.dylib
- Shlibs: %p/lib/libGmsh.%v.dylib 0.0.0 %n (>= 2.6.0-1)
+ Shlibs: %p/lib/libGmsh.%v.dylib 0.0.0 %n (>= 2.6.1-1)
DocFiles: doc/LICENSE.txt
DescUsage: <<
This package contains a shared library.
<<
<<
SplitOff2: <<
- Package: %N2.6.0-dev
- Conflicts: %N2.5.0-dev
- Replaces: %N2.5.0-dev
+ Package: %N2.6.1-dev
+ Conflicts: %N2.5.0-dev, %N2.6.0-dev
+ Replaces: %N2.5.0-dev, %N2.6.0-dev
Files: include lib
BuildDependsOnly: true
DocFiles: doc/LICENSE.txt
Index: gmsh2.5.0-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gmsh2.5.0-shlibs.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gmsh2.5.0-shlibs.info 16 Jul 2012 17:24:34 -0000 1.8
+++ gmsh2.5.0-shlibs.info 17 Jul 2012 19:14:19 -0000 1.9
@@ -1,6 +1,6 @@
Package: gmsh2.5.0-shlibs
Version: 2.5.0
-Revision: 7
+Revision: 8
Depends: <<
fltk13-aqua-shlibs,
gmp5-shlibs,
@@ -30,6 +30,7 @@
PatchFile-MD5: 8cc25ef1248f37664023e3e511cd10d5
PatchScript: <<
%{default_script}
+perl -pi -e 's|-framework vecLib|-framework Accelerate|' CMakeLists.txt
perl -pi -e 's|(void.*return)\s0\.|$1|g' Solver/linearSystemPETSc.h
<<
@@ -109,8 +110,8 @@
Splitoff: <<
Package: gmsh2.5.0-dev
- Conflicts: gmsh2.6.0-dev
- Replaces: gmsh2.6.0-dev
+ Conflicts: gmsh2.6.0-dev, gmsh2.6.1-dev
+ Replaces: gmsh2.6.0-dev, gmsh2.6.1-dev
Depends: %N
Files: <<
include
--- NEW FILE: gmsh-2.6.0.info ---
Package: gmsh
Version: 2.6.0
Revision: 3
Depends: <<
fltk13-aqua-shlibs,
gmp5-shlibs,
libjpeg8-shlibs,
libpng14-shlibs,
lua51-shlibs,
libncurses5-shlibs,
readline6-shlibs
<<
BuildDepends: <<
cmake,
fltk13-aqua,
gmp5,
libjpeg8,
libpng14,
lua51-dev,
libncurses5,
readline6
<<
Source: http://www.geuz.org/%n/src/%n-%v-source.tgz
Source-MD5: 404fc5ad6194b959c72ec9b0d9b190e7
SourceDirectory: %n-%v-source
GCC: 4.0
PatchFile: %n.patch
PatchFile-MD5: fa117d7ee3adb9f218ce08cb3f547819
PatchScript: <<
%{default_script}
perl -pi -e 's|-framework vecLib|-framework Accelerate|' CMakeLists.txt
perl -pi -e 's|end\+|begin_+|g' contrib/gmm/gmm_interface.h
perl -pi -e 's|return;|return NULL;|'
contrib/mmg3d/build/sources/ratio.c
<<
CompileScript: <<
#!/bin/sh -ev
mkdir build
cd build
cmake -DCMAKE_PREFIX_PATH=%p \
-DCMAKE_INSTALL_PREFIX=%i \
-DENABLE_WRAP_PYTHON=no \
..
make verbose=1
make verbose=1 shared
make -j1 verbose=1 html
make -j1 verbose=1 info
make -j1 verbose=1 txt
<<
InstallScript: <<
#!/bin/sh -ev
pushd build
make install
#fix app bundle
# move app bundle back into build directory
mv %i/Gmsh.app %b
cp Info.plist %b/Gmsh.app/Contents
popd
cp %b/Fltk/MacIcons.icns %b/Gmsh.app/Contents/Resources/Gmsh.icns
# put a copy of the executable in %p/bin for e.g. the Octave Forge
# packages that expect a "gmsh" executable in the PATH.
mkdir -p %i/bin
cp -r %b/Gmsh.app/Contents/MacOS/%n %i/bin
chmod a+x %i/bin/%n
# fix library up
pushd %i/lib
mv libGmsh.dylib libGmsh.%v.dylib
ln -s libGmsh.%v.dylib libGmsh.dylib
install_name_tool -id %p/lib/libGmsh.%v.dylib libGmsh.%v.dylib
popd
# put texinfo file in proper location for Fink
mkdir -p %i/share/info
cp doc/texinfo/%n.info %i/share/info/
<<
DocFiles: doc/
InfoDocs: %n.info
AppBundles: Gmsh.app
Homepage: http://www.geuz.org/gmsh
Maintainer: Alexander Hansen <[email protected]>
License: GPL/LGPL
Description: 3D finite element mesh generator
DescDetail: <<
Gmsh is an automatic 3D finite element mesh generator (primarily
Delaunay) with build-in CAD and post-processing facilities. Its
design goal is to provide a simple meshing tool for academic test
cases with parametric input and up to date visualization
capabilities.
Gmsh is built around four modules: geometry, mesh, solver and
post-processing. The specification of any input to these modules is
done either interactively using the graphical user interface or in
ASCII text files using Gmsh's own scripting language.
See Gmsh's reference manual for a more thorough overview of Gmsh's
capabilities.
<<
DescUsage: <<
This package contains the '%n' executable, an app bundle, and documentation
including demos and tutorial material.
<<
DescPackaging: <<
Executable is built statically from the object files directly, rather
than
via libraries, so there is no dependency on gmsh2.6.0-shlibs.
Patch to install docs in their proper locations when using "make
install".
Thanks to Nicholas Taylor for the original form of the patch.
The app bundle build takes a lot of manual fiddling.
Patch contrib/mmg3d/build/sources/ratio.c where a non-void function has
a
return without a value.
There appears to be something awry in contrib/gmm/gmm_interface.h .
clang from Xcode 4.3 decided that there was an error, and by inspection
there
appears indeed to be one. I implemented a patch which seemed to be
correct in
context.
This file is currently still unchanged in upstream's SVN.
Uses vecLib for BLAS. (we patch this to Accelerate)
It appears not to use Fink's ATLAS even when that's
installed, so no -atlas variant currently.
Python binding is currently disabled because the package tries to mix
Apple and
Fink Pythons.
<<
SplitOff: <<
Package: %N2.6.0-shlibs
Files: lib/libGmsh.%v.dylib
Shlibs: %p/lib/libGmsh.%v.dylib 0.0.0 %n (>= 2.6.0-1)
DocFiles: doc/LICENSE.txt
DescUsage: <<
This package contains a shared library.
<<
<<
SplitOff2: <<
Package: %N2.6.0-dev
Conflicts: %N2.5.0-dev, %N2.6.1-dev
Replaces: %N2.5.0-dev, %N2.6.1-dev
Files: include lib
BuildDependsOnly: true
DocFiles: doc/LICENSE.txt
DescUsage: <<
This package contains build-time files (headers and unversioned
dylib).
<<
<<
------------------------------------------------------------------------------
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
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
