Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv7892/10.4/stable/main/finkinfo/sci
Modified Files:
gmsh.info gmsh.patch gmsh2.5.0-shlibs.info
Added Files:
gmsh-2.5.0.patch
Log Message:
New upstream gmsh
Index: gmsh.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gmsh.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gmsh.info 20 Feb 2012 20:40:42 -0000 1.3
+++ gmsh.info 3 Jul 2012 16:05:13 -0000 1.4
@@ -1,6 +1,7 @@
Package: gmsh
-Version: 2.5.0
-Revision: 2
+Version: 2.6.0
+Revision: 1
+
Depends: <<
fltk13-aqua-shlibs,
gmp5-shlibs,
@@ -8,7 +9,7 @@
libpng14-shlibs,
lua51-shlibs,
libncurses5-shlibs,
- readline5-shlibs
+ readline6-shlibs
<<
BuildDepends: <<
cmake,
@@ -18,49 +19,75 @@
libpng14,
lua51-dev,
libncurses5,
- readline5
+ readline6
<<
+Conflicts: gmsh2.5.0-shlibs
+Replaces: gmsh2.6.0-shlibs
+
Source: http://www.geuz.org/%n/src/%n-%v-source.tgz
-Source-MD5: afa48c0296dba08641bc6312b0ccabf5
+Source-MD5: 404fc5ad6194b959c72ec9b0d9b190e7
SourceDirectory: %n-%v-source
GCC: 4.0
PatchFile: %n.patch
-PatchFile-MD5: 8cc25ef1248f37664023e3e511cd10d5
+PatchFile-MD5: fa117d7ee3adb9f218ce08cb3f547819
PatchScript: <<
-%{default_script}
-perl -pi -e 's|(void.*return)\s0\.|$1|g' Solver/linearSystemPETSc.h
+ %{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
<<
-UseMaxBuildJobs: false
-
CompileScript: <<
#!/bin/sh -ev
mkdir build
cd build
-cmake -DCMAKE_PREFIX_PATH=%p -DCMAKE_INSTALL_PREFIX=%i d ..
+cmake -DCMAKE_PREFIX_PATH=%p \
+ -DCMAKE_INSTALL_PREFIX=%i \
+ -DENABLE_WRAP_PYTHON=no \
+ d ..
make verbose=1
-make verbose=1 html
-make verbose=1 info
-make verbose=1 txt
+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/
-# clear out include directory since there's nothing to build
-# against in this package
-rm -rf %i/include
<<
DocFiles: doc/
InfoDocs: %n.info
+AppBundles: Gmsh.app
+
Homepage: http://www.geuz.org/gmsh
Maintainer: Alexander Hansen <[email protected]>
@@ -82,25 +109,49 @@
capabilities.
<<
DescUsage: <<
-This package contains the '%n' executable and documentation, including demos
-and tutorial.
+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 gmshX.Y.Z-shlibs.
-
- Oddly enough, clang complains about a void function with a return
- value :-) so we patch that.
+ via libraries, so there is no dependency on gmsh2.6.0-shlibs.
- As of 2.5.0-2: patch to install docs and executable in proper locations
- using "make install". Thanks to Nicholas Taylor for the patch.
+ 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.
- Uses Veclib for BLAS. It appears not to use Fink's ATLAS even when
that's
- installed, so no -atlas variant currently.
+ 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
gmsh-2.5.0-source/contrib/gmm/gmm_interface.h .
+ 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.
- <<
\ No newline at end of file
+
+ 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
+ Files: include lib
+ BuildDependsOnly: true
+ DocFiles: doc/LICENSE.txt
+ DescUsage: <<
+ This package contains build-time files (headers and unversioned
dylib).
+ <<
+<<
\ No newline at end of file
--- NEW FILE: gmsh-2.5.0.patch ---
diff -Nur gmsh-2.5.0-source/CMakeLists.txt
gmsh-2.5.0-source.patched/CMakeLists.txt
--- gmsh-2.5.0-source/CMakeLists.txt 2010-10-15 14:35:00.000000000 +0100
+++ gmsh-2.5.0-source.patched/CMakeLists.txt 2011-09-29 17:04:06.000000000
+0100
@@ -955,9 +955,9 @@
# set these so that the files get installed nicely in the MacOSX
# .app bundle (FIXME: this screws up a standard "make install" on
# MacOS)
- set(GMSH_BIN ../MacOS)
- set(GMSH_DOC ../../..)
- set(GMSH_MAN ../../..)
+ set(GMSH_BIN bin)
+ set(GMSH_DOC share/doc/gmsh)
+ set(GMSH_MAN share/man/man1)
else(WIN32)
set(GMSH_BIN bin)
set(GMSH_DOC share/doc/gmsh)
@@ -1057,12 +1057,6 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist "${F1}")
set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
set(CPACK_BUNDLE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsGeo.icns DESTINATION .
- RENAME GmshGeo.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION .
- RENAME GmshMsh.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION .
- RENAME GmshPos.icns)
set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
elseif(WIN32)
set(CPACK_GENERATOR ZIP)
diff -Nurd gmsh-2.5.0-source/contrib/gmm/gmm_interface.h
gmsh-2.5.0-source.patched/contrib/gmm/gmm_interface.h
--- gmsh-2.5.0-source/contrib/gmm/gmm_interface.h 2010-10-15
09:35:00.000000000 -0400
+++ gmsh-2.5.0-source.patched/contrib/gmm/gmm_interface.h 2012-02-20
13:03:11.000000000 -0500
@@ -831,8 +831,8 @@
}
void fill(T a, T b = T(0)) {
- std::fill(begin_, end+nbc*nbl, b);
- iterator p = begin_, e = end+nbc*nbl;
+ std::fill(begin_, begin_+nbc*nbl, b);
+ iterator p = begin_, e = begin_+nbc*nbl;
while (p < e) { *p = a; p += nbl+1; }
}
inline size_type nrows(void) const { return nbl; }
@@ -957,8 +957,8 @@
}
void fill(T a, T b = T(0)) {
- std::fill(begin_, end+nbc*nbl, b);
- iterator p = begin_, e = end+nbc*nbl;
+ std::fill(begin_, begin_+nbc*nbl, b);
+ iterator p = begin_, e = begin_+nbc*nbl;
while (p < e) { *p = a; p += nbc+1; }
}
inline size_type nrows(void) const { return nbl; }
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.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gmsh2.5.0-shlibs.info 20 Feb 2012 20:40:42 -0000 1.6
+++ gmsh2.5.0-shlibs.info 3 Jul 2012 16:05:13 -0000 1.7
@@ -1,6 +1,6 @@
Package: gmsh2.5.0-shlibs
Version: 2.5.0
-Revision: 5
+Revision: 6
Depends: <<
fltk13-aqua-shlibs,
gmp5-shlibs,
@@ -20,13 +20,15 @@
libncurses5,
readline5
<<
+Conflicts: gmsh2.6.0-shlibs
+Replaces: gmsh2.6.0-shlibs
Source: http://www.geuz.org/gmsh/src/gmsh-%v-source.tgz
Source-MD5: afa48c0296dba08641bc6312b0ccabf5
SourceDirectory: gmsh-%v-source
GCC: 4.0
-PatchFile: gmsh.patch
+PatchFile: gmsh-%v.patch
PatchFile-MD5: 8cc25ef1248f37664023e3e511cd10d5
PatchScript: <<
%{default_script}
Index: gmsh.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gmsh.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gmsh.patch 20 Feb 2012 20:40:42 -0000 1.2
+++ gmsh.patch 3 Jul 2012 16:05:13 -0000 1.3
@@ -1,54 +1,31 @@
-diff -Nur gmsh-2.5.0-source/CMakeLists.txt
gmsh-2.5.0-source.patched/CMakeLists.txt
---- gmsh-2.5.0-source/CMakeLists.txt 2010-10-15 14:35:00.000000000 +0100
-+++ gmsh-2.5.0-source.patched/CMakeLists.txt 2011-09-29 17:04:06.000000000
+0100
-@@ -955,9 +955,9 @@
+diff -Nurd gmsh-2.6.0-source/CMakeLists.txt
gmsh-2.6.0-source.patched/CMakeLists.txt
+--- gmsh-2.6.0-source/CMakeLists.txt 2012-06-19 09:45:08.000000000 -0700
++++ gmsh-2.6.0-source.patched/CMakeLists.txt 2012-07-03 05:26:50.000000000
-0700
+@@ -1145,9 +1145,9 @@
+ elseif(APPLE AND ENABLE_APP_BUNDLE)
# set these so that the files get installed nicely in the MacOSX
- # .app bundle (FIXME: this screws up a standard "make install" on
- # MacOS)
+ # .app bundle
- set(GMSH_BIN ../MacOS)
- set(GMSH_DOC ../../..)
- set(GMSH_MAN ../../..)
-+ set(GMSH_BIN bin)
++ set(GMSH_BIN Gmsh.app/Contents/MacOS)
+ set(GMSH_DOC share/doc/gmsh)
+ set(GMSH_MAN share/man/man1)
- else(WIN32)
+ else(WIN32 OR CYGWIN)
set(GMSH_BIN bin)
set(GMSH_DOC share/doc/gmsh)
-@@ -1057,12 +1057,6 @@
+@@ -1276,11 +1276,11 @@
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Info.plist "${F1}")
set(CPACK_BUNDLE_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
set(CPACK_BUNDLE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsGeo.icns DESTINATION
.
-- RENAME GmshGeo.icns)
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsGeo.icns DESTINATION
Gmsh.app/Contents/Resources
+ RENAME GmshGeo.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION
.
-- RENAME GmshMsh.icns)
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsMsh.icns DESTINATION
Gmsh.app/Contents/Resources
+ RENAME GmshMsh.icns)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION
.
-- RENAME GmshPos.icns)
++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIconsPos.icns DESTINATION
Gmsh.app/Contents/Resources
+ RENAME GmshPos.icns)
set(CPACK_PACKAGE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/Fltk/MacIcons.icns)
- elseif(WIN32)
- set(CPACK_GENERATOR ZIP)
-diff -Nurd gmsh-2.5.0-source/contrib/gmm/gmm_interface.h
gmsh-2.5.0-source.patched/contrib/gmm/gmm_interface.h
---- gmsh-2.5.0-source/contrib/gmm/gmm_interface.h 2010-10-15
09:35:00.000000000 -0400
-+++ gmsh-2.5.0-source.patched/contrib/gmm/gmm_interface.h 2012-02-20
13:03:11.000000000 -0500
-@@ -831,8 +831,8 @@
- }
-
- void fill(T a, T b = T(0)) {
-- std::fill(begin_, end+nbc*nbl, b);
-- iterator p = begin_, e = end+nbc*nbl;
-+ std::fill(begin_, begin_+nbc*nbl, b);
-+ iterator p = begin_, e = begin_+nbc*nbl;
- while (p < e) { *p = a; p += nbl+1; }
- }
- inline size_type nrows(void) const { return nbl; }
-@@ -957,8 +957,8 @@
- }
-
- void fill(T a, T b = T(0)) {
-- std::fill(begin_, end+nbc*nbl, b);
-- iterator p = begin_, e = end+nbc*nbl;
-+ std::fill(begin_, begin_+nbc*nbl, b);
-+ iterator p = begin_, e = begin_+nbc*nbl;
- while (p < e) { *p = a; p += nbc+1; }
- }
- inline size_type nrows(void) const { return nbl; }
+ elseif(WIN32 OR CYGWIN)
------------------------------------------------------------------------------
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
