r47312 - in /packages/gmsh-tetgen/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Thu Jul 7 07:31:31 UTC 2016
Author: trophime-guest
Date: Thu Jul 7 07:31:28 2016
New Revision: 47312
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47312
Log:
update for rev 23232
Modified:
packages/gmsh-tetgen/trunk/debian/changelog
packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch
packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
packages/gmsh-tetgen/trunk/debian/patches/clang.patch
packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch
packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch
packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
packages/gmsh-tetgen/trunk/debian/patches/med.patch
packages/gmsh-tetgen/trunk/debian/patches/metis-errormsg.patch
packages/gmsh-tetgen/trunk/debian/patches/metis.patch
packages/gmsh-tetgen/trunk/debian/patches/mmg3d4.0.2.patch
packages/gmsh-tetgen/trunk/debian/patches/petsc.patch
packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch
packages/gmsh-tetgen/trunk/debian/patches/series
packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch
packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
packages/gmsh-tetgen/trunk/debian/rules
Modified: packages/gmsh-tetgen/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/changelog?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/changelog (original)
+++ packages/gmsh-tetgen/trunk/debian/changelog Thu Jul 7 07:31:28 2016
@@ -1,3 +1,9 @@
+gmsh-tetgen (2.12.2~svn23232-1) unstable; urgency=medium
+
+ * Update to latest svn
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 14 Jun 2016 13:32:34 +0200
+
gmsh-tetgen (2.12.0-1) unstable; urgency=medium
* new upstream release
Modified: packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Thu Jul 7 07:31:28 2016
@@ -3,11 +3,11 @@
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-06-24
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -130,6 +130,7 @@ set(GMSH_API
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -129,6 +129,7 @@ set(GMSH_API
Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h
Mesh/simple3D.h Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h Mesh/meshMetric.h Mesh/ThinLayer.h
@@ -15,7 +15,7 @@
Numeric/mathEvaluator.h
Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
Solver/crossConfTerm.h Solver/orthogonalTerm.h
-@@ -141,6 +142,7 @@ set(GMSH_API
+@@ -140,6 +141,7 @@ set(GMSH_API
Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
Numeric/nodalBasis.h Post/adaptiveData.h
Graphics/drawContext.h
Modified: packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/alauzet.patch Thu Jul 7 07:31:28 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn19081/Mesh/Field.cpp
+Index: gmsh-tetgen-2.12.2~svn23232/Mesh/Field.cpp
===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/Mesh/Field.cpp
-+++ gmsh-tetgen-2.8.5~svn19081/Mesh/Field.cpp
-@@ -1340,17 +1340,21 @@ class MinAnisoField : public Field
+--- gmsh-tetgen-2.12.2~svn23232.orig/Mesh/Field.cpp
++++ gmsh-tetgen-2.12.2~svn23232/Mesh/Field.cpp
+@@ -1571,17 +1571,21 @@ class MinAnisoField : public Field
}
virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
{
@@ -24,10 +24,10 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-Index: gmsh-tetgen-2.8.5~svn19081/Geo/STensor3.h
+Index: gmsh-tetgen-2.12.2~svn23232/Geo/STensor3.h
===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/Geo/STensor3.h
-+++ gmsh-tetgen-2.8.5~svn19081/Geo/STensor3.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/Geo/STensor3.h
++++ gmsh-tetgen-2.12.2~svn23232/Geo/STensor3.h
@@ -175,6 +175,8 @@ SMetric3 intersection (const SMetric3 &m
const SMetric3 &m2);
SMetric3 intersection_alauzet (const SMetric3 &m1,
Modified: packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/api_demos.patch Thu Jul 7 07:31:28 2016
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.12.0/utils/api_demos/mainAntTweakBar.cpp
-===================================================================
---- gmsh-tetgen-2.12.0.orig/utils/api_demos/mainAntTweakBar.cpp
-+++ gmsh-tetgen-2.12.0/utils/api_demos/mainAntTweakBar.cpp
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainAntTweakBar.cpp
+===================================================================
+--- gmsh-tetgen-2.12.2~svn23232.orig/utils/api_demos/mainAntTweakBar.cpp
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainAntTweakBar.cpp
@@ -14,6 +14,7 @@
#include "GModel.h"
#include "MElement.h"
@@ -10,10 +10,10 @@
static drawContext *ctx = 0;
static mousePosition clickPos, prevPos;
-Index: gmsh-tetgen-2.12.0/utils/api_demos/mainOcc.cpp
-===================================================================
---- gmsh-tetgen-2.12.0.orig/utils/api_demos/mainOcc.cpp
-+++ gmsh-tetgen-2.12.0/utils/api_demos/mainOcc.cpp
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainOcc.cpp
+===================================================================
+--- gmsh-tetgen-2.12.2~svn23232.orig/utils/api_demos/mainOcc.cpp
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainOcc.cpp
@@ -19,7 +19,7 @@
#include "MElement.h"
@@ -23,11 +23,11 @@
#endif
#include <TopoDS_Shape.hxx>
#include <BRep_Tool.hxx>
-Index: gmsh-tetgen-2.12.0/utils/api_demos/CMakeLists.txt
-===================================================================
---- gmsh-tetgen-2.12.0.orig/utils/api_demos/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/utils/api_demos/CMakeLists.txt
-@@ -13,46 +13,81 @@ project(api_demos CXX)
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.12.2~svn23232.orig/utils/api_demos/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/CMakeLists.txt
+@@ -13,48 +13,83 @@ project(api_demos CXX)
add_subdirectory(../.. "${CMAKE_CURRENT_BINARY_DIR}/gmsh")
@@ -132,10 +132,12 @@
-target_link_libraries(mainGeoFactory shared)
+target_link_libraries(mainGeoFactory ${GMSH_EXTERNAL_LIBRARIES})
-Index: gmsh-tetgen-2.12.0/utils/api_demos/mainCartesian.cpp
-===================================================================
---- gmsh-tetgen-2.12.0.orig/utils/api_demos/mainCartesian.cpp
-+++ gmsh-tetgen-2.12.0/utils/api_demos/mainCartesian.cpp
+ add_executable(mainRemesh mainRemesh.cpp)
+ target_link_libraries(mainRemesh shared)
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainCartesian.cpp
+===================================================================
+--- gmsh-tetgen-2.12.2~svn23232.orig/utils/api_demos/mainCartesian.cpp
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainCartesian.cpp
@@ -12,7 +12,7 @@
#include "GmshMessage.h"
#include "cartesian.h"
@@ -243,10 +245,10 @@
Msg::Info("Removing cells outside the structure");
removeOutsideCells(&box);
-Index: gmsh-tetgen-2.12.0/utils/api_demos/mainElasticity.cpp
-===================================================================
---- gmsh-tetgen-2.12.0.orig/utils/api_demos/mainElasticity.cpp
-+++ gmsh-tetgen-2.12.0/utils/api_demos/mainElasticity.cpp
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainElasticity.cpp
+===================================================================
+--- gmsh-tetgen-2.12.2~svn23232.orig/utils/api_demos/mainElasticity.cpp
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainElasticity.cpp
@@ -3,6 +3,7 @@
#include "elasticitySolver.h"
#include "PView.h"
@@ -255,10 +257,10 @@
void Info (int i, char* c){
printf("%d %s\n",i,c);
-Index: gmsh-tetgen-2.12.0/utils/api_demos/mainHomology.cpp
-===================================================================
---- gmsh-tetgen-2.12.0.orig/utils/api_demos/mainHomology.cpp
-+++ gmsh-tetgen-2.12.0/utils/api_demos/mainHomology.cpp
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainHomology.cpp
+===================================================================
+--- gmsh-tetgen-2.12.2~svn23232.orig/utils/api_demos/mainHomology.cpp
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/mainHomology.cpp
@@ -8,6 +8,7 @@
#include <stdio.h>
@@ -267,10 +269,10 @@
#include "Gmsh.h"
#include "GModel.h"
#include "MElement.h"
-Index: gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindGmsh.cmake
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindGmsh.cmake
===================================================================
--- /dev/null
-+++ gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindGmsh.cmake
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindGmsh.cmake
@@ -0,0 +1,119 @@
+# -*- mode: cmake -*-
+#
@@ -391,10 +393,10 @@
+
+
+
-Index: gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
===================================================================
--- /dev/null
-+++ gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindAnttweakbar.cmake
@@ -0,0 +1,12 @@
+FIND_LIBRARY(ANTTWEAKBAR_LIB AntTweakBar PATHS /usr/lib /opt/local/lib $ENV{ANTTWEAKBAR_DIR}/lib)
+SET(ANTTWEAKBAR_LIBRARIES ${ANTTWEAKBAR_LIB} )
@@ -408,10 +410,10 @@
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ANTTWEAKBAR "Could not find ANTTWEAKBAR " ANTTWEAKBAR_INCLUDE_DIR ANTTWEAKBAR_LIB)
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(ANTTWEAKBAR_INCLUDE_DIR ANTTWEAKBAR_LIBRARIES )
-Index: gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindOCC.cmake
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindOCC.cmake
===================================================================
--- /dev/null
-+++ gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindOCC.cmake
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindOCC.cmake
@@ -0,0 +1,34 @@
+set(OCC_LIBS_REQUIRED
+ # subset of DataExchange
@@ -447,10 +449,10 @@
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OCC "Could not find OCC " OCC_INCLUDE_DIR OCC_LIBRARIES)
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(OCC_INCLUDE_DIR OCC_LIBRARIES )
-Index: gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindGLUT.cmake
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindGLUT.cmake
===================================================================
--- /dev/null
-+++ gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindGLUT.cmake
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindGLUT.cmake
@@ -0,0 +1,20 @@
+include (FindPackageHandleStandardArgs)
+
@@ -472,10 +474,10 @@
+# show the BERKELEY_DB_INCLUDE_DIR and BERKELEY_DB_LIBRARIES variables only in the advanced view
+MARK_AS_ADVANCED(GLUT_LIBRARY )
+MARK_AS_ADVANCED(GLU_LIBRARY )
-Index: gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindANN.cmake
+Index: gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindANN.cmake
===================================================================
--- /dev/null
-+++ gmsh-tetgen-2.12.0/utils/api_demos/cmake/modules/FindANN.cmake
++++ gmsh-tetgen-2.12.2~svn23232/utils/api_demos/cmake/modules/FindANN.cmake
@@ -0,0 +1,44 @@
+# -*- mode: cmake -*-
+#
Modified: packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch Thu Jul 7 07:31:28 2016
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh-tetgen-2.12.0/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.12.2~svn23232.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
@@ -19,11 +19,11 @@
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1442,7 +1442,7 @@ endforeach(DIR)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1448,7 +1448,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1469,7 +1469,7 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1475,7 +1475,7 @@ endif(ENABLE_BUILD_ANDROID)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
Modified: packages/gmsh-tetgen/trunk/debian/patches/clang.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/clang.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/clang.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/clang.patch Thu Jul 7 07:31:28 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -710,13 +710,15 @@ endif(ENABLE_MATHEX)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -713,13 +713,15 @@ endif(ENABLE_MATHEX)
if(ENABLE_MPI)
find_package(MPI)
if(MPI_FOUND)
Modified: packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch Thu Jul 7 07:31:28 2016
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.12.0/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/Graphics/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/Graphics/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/Graphics/CMakeLists.txt
+--- gmsh-tetgen-2.12.2~svn23232.orig/Graphics/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +14,11 @@
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1503,7 +1503,7 @@ else(HAVE_FLTK)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1509,7 +1509,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-cmake-hdf5.patch Thu Jul 7 07:31:28 2016
@@ -2,11 +2,11 @@
Author: Gilles Filippini <pini at debian.org>
Last-Update: 2014-07-25
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -828,8 +828,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -832,8 +832,10 @@ if(ENABLE_FOURIER_MODEL)
endif(ENABLE_FOURIER_MODEL)
if(ENABLE_MED OR ENABLE_CGNS)
@@ -19,7 +19,7 @@
if(ENABLE_MED)
find_library(MED_LIB med)
if(MED_LIB)
-@@ -864,9 +866,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -868,9 +870,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
endif(ZLIB_FOUND)
endif(NOT HAVE_LIBZ)
endif(MED_LIB OR CGNS_LIB)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-cmake.patch Thu Jul 7 07:31:28 2016
@@ -23,11 +23,11 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1244,11 +1244,11 @@ if(HAVE_PYTHON)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1248,11 +1248,11 @@ if(HAVE_PYTHON)
endif(ENABLE_NUMPY)
if(HAVE_PETSC)
if(ENABLE_PETSC4PY)
@@ -43,7 +43,7 @@
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(PETSC4PY_INC)
-@@ -1309,7 +1309,7 @@ endif(WIN32 OR CYGWIN)
+@@ -1315,7 +1315,7 @@ endif(WIN32 OR CYGWIN)
# force full warnings to encourage everybody to write clean(er) code
check_cxx_compiler_flag("-Wall" WALL)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch Thu Jul 7 07:31:28 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.0/Common/OS.cpp
+Index: gmsh-tetgen-2.12.2~svn23232/Common/OS.cpp
===================================================================
---- gmsh-tetgen-2.12.0.orig/Common/OS.cpp
-+++ gmsh-tetgen-2.12.0/Common/OS.cpp
-@@ -405,7 +405,8 @@ std::string GetExecutableFileName()
+--- gmsh-tetgen-2.12.2~svn23232.orig/Common/OS.cpp
++++ gmsh-tetgen-2.12.2~svn23232/Common/OS.cpp
+@@ -404,7 +404,8 @@ std::string GetExecutableFileName()
}
#elif defined(__linux__)
char path[4096];
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Thu Jul 7 07:31:28 2016
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-04-08
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1480,7 +1480,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1486,7 +1486,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
message(STATUS "Note: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library "
"won't link. In MSVC change /MT to /MD in the shared project properties")
endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)
Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch Thu Jul 7 07:31:28 2016
@@ -2,10 +2,10 @@
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-tetgen-2.12.0/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.12.2~svn23232.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/wrappers/java/CMakeLists.txt
@@ -73,6 +73,6 @@ POST_BUILD # do the rest of the command
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
@@ -15,11 +15,11 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1624,7 +1624,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1630,7 +1630,7 @@ endif(WIN32 OR CYGWIN)
# (e.g. "make lib" or "make shared" followed by "make install/fast")
install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
if(ENABLE_BUILD_LIB)
@@ -28,7 +28,7 @@
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1660,7 +1660,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1666,7 +1666,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
endif(GCC_DLL AND STDC_DLL)
else(WIN32 AND NOT MSVC OR CYGWIN)
Modified: packages/gmsh-tetgen/trunk/debian/patches/med.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/med.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/med.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/med.patch Thu Jul 7 07:31:28 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.10.2~svn22060/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.10.2~svn22060.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.10.2~svn22060/CMakeLists.txt
-@@ -836,6 +836,10 @@
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -840,6 +840,10 @@ if(ENABLE_MED OR ENABLE_CGNS)
set_config_option(HAVE_MED "Med")
list(APPEND EXTERNAL_LIBRARIES ${MED_LIB})
endif(MED_LIB)
@@ -13,7 +13,7 @@
endif(ENABLE_MED)
if(ENABLE_CGNS)
find_library(CGNS_LIB cgns PATHS ENV CGNS_ROOT PATH_SUFFIXES lib)
-@@ -1861,7 +1865,7 @@
+@@ -1870,7 +1874,7 @@ message(STATUS "")
mark_as_advanced(GMSH_EXTRA_VERSION
ACIS_LIB ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC CGNS_INC GMM_INC
GMP_INC GMP_LIB MMG3D_INC MMG3D_LIB HDF5_LIB
Modified: packages/gmsh-tetgen/trunk/debian/patches/metis-errormsg.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/metis-errormsg.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/metis-errormsg.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/metis-errormsg.patch Thu Jul 7 07:31:28 2016
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.12.0/contrib/Metis/coarsen.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/Metis/coarsen.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/Metis/coarsen.c
-+++ gmsh-tetgen-2.12.0/contrib/Metis/coarsen.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/Metis/coarsen.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/Metis/coarsen.c
@@ -60,7 +60,7 @@ GraphType *Coarsen2Way(CtrlType *ctrl, G
Match_SHEM(ctrl, cgraph);
break;
@@ -11,10 +11,10 @@
}
}
else {
-Index: gmsh-tetgen-2.12.0/contrib/Metis/mcoarsen.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/Metis/mcoarsen.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/Metis/mcoarsen.c
-+++ gmsh-tetgen-2.12.0/contrib/Metis/mcoarsen.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/Metis/mcoarsen.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/Metis/mcoarsen.c
@@ -67,7 +67,7 @@ GraphType *MCCoarsen2Way(CtrlType *ctrl,
MCMatch_SBHEM(ctrl, cgraph, -1);
break;
Modified: packages/gmsh-tetgen/trunk/debian/patches/metis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/metis.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/metis.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/metis.patch Thu Jul 7 07:31:28 2016
@@ -11,3 +11,16 @@
fflush(stdout);
abort();
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/Metis/proto.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/Metis/proto.h
+@@ -455,8 +455,8 @@ float snorm2(int, float *);
+ float sdot(int n, float *, float *);
+ void saxpy(int, float, float *, int, float *, int);
+ void RandomPermute(int, idxtype *, int);
+-double drand48();
+-void srand48(long);
++//double drand48();
++//void srand48(long);
+ int ispow2(int);
+ void InitRandom(int);
+ int METISlog2(int); /* Gmsh: changed fron log2 */
Modified: packages/gmsh-tetgen/trunk/debian/patches/mmg3d4.0.2.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/mmg3d4.0.2.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/mmg3d4.0.2.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/mmg3d4.0.2.patch Thu Jul 7 07:31:28 2016
@@ -1,7 +1,7 @@
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/analar.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/analar.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/analar.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/analar.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/analar.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/analar.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -522,10 +522,10 @@
}
-
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/analarcutting.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/analarcutting.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/analarcutting.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/analarcutting.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/analarcutting.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/analarcutting.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -1041,10 +1041,10 @@
-
-
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/baryct.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/baryct.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/baryct.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/baryct.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/baryct.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/baryct.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -1139,10 +1139,10 @@
return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/boulep.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/boulep.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/boulep.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/boulep.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/boulep.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/boulep.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -1310,10 +1310,10 @@
}
}
/* overflow */
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/bucket.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/bucket.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/bucket.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/bucket.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/bucket.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/bucket.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -1662,10 +1662,10 @@
return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/cendel.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/cendel.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/cendel.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/cendel.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/cendel.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/cendel.c
@@ -56,22 +56,22 @@ int MMG_cendel(pMesh mesh,pSol sol,doubl
int *adja,adj,iadr,ier,i,j,k,jel,lon,ns,np;
int vois[4],ref,tag;
@@ -1823,10 +1823,10 @@
+ MMG_kiufree(queue);
+ return(ns);
+}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/cenrad.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/cenrad.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/cenrad.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/cenrad.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/cenrad.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/cenrad.c
@@ -58,6 +58,7 @@ int MMG_cenrad_iso(pMesh mesh,double *ct
ux = c4[0] - c1[0];
uy = c4[1] - c1[1];
@@ -1868,10 +1868,10 @@
return(1);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/chkmsh.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/chkmsh.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/chkmsh.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/chkmsh.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/chkmsh.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/chkmsh.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -2073,10 +2073,10 @@
}
}
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/chrono.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/chrono.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/chrono.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/chrono.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/chrono.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/chrono.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -2292,10 +2292,10 @@
}
#endif
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/chrono.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/chrono.h
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/chrono.h
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/chrono.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/chrono.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/chrono.h
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -2377,10 +2377,10 @@
#ifdef __cplusplus
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/colpoi.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/colpoi.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/colpoi.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/colpoi.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/colpoi.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/colpoi.c
@@ -76,7 +76,10 @@ int MMG_colpoi(pMesh mesh,pSol sol,int i
kk = list.tetra[l] >> 2;
cal = mesh->tetra[kk].qual;//(sol->offset==6) ? MMG_caltet_ani(mesh,sol,kk) : MMG_caltet_iso(mesh,sol,kk);
@@ -2431,10 +2431,10 @@
MMG_nlen++;
memcpy(pb->c,coor,3*sizeof(double));
memcpy(&sol->met[iadb],solu,sol->offset*sizeof(double));
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/coquil.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/coquil.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/coquil.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/coquil.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/coquil.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/coquil.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -2644,10 +2644,10 @@
+ assert(!adj);
+ return( 2*ilist+1 );
+}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/cutelt.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/cutelt.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/cutelt.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/cutelt.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/cutelt.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/cutelt.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -4209,10 +4209,10 @@
+ }
+ return(1);
+}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/defines.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/defines.h
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/defines.h
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/defines.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/defines.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/defines.h
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -4301,10 +4301,10 @@
extern unsigned char MMG_idir[4][3];
extern unsigned char MMG_inxt[7];
extern unsigned char MMG_iarf[4][3];
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/delaunay.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/delaunay.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/delaunay.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/delaunay.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/delaunay.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/delaunay.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -5232,10 +5232,10 @@
return(ilist);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/eigenv.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/eigenv.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/eigenv.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/eigenv.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/eigenv.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/eigenv.c
@@ -47,7 +47,7 @@ along with MMG3D. If not, see <http://ww
#include <string.h>
#include <math.h>
@@ -5573,10 +5573,10 @@
xn = 1.0 / xn;
lambda[0] = rr1 * xn;
lambda[1] = rr2 * xn;
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/eigenv.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/eigenv.h
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/eigenv.h
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/eigenv.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/eigenv.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/eigenv.h
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -5631,10 +5631,10 @@
****************************************************************************/
int eigenv(int symmat,double *mat,double lambda[3],double v[3][3]);
int eigen2(double *mm,double *lambda,double vp[2][2]);
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/hash.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/hash.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/hash.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/hash.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/hash.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/hash.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -6205,10 +6205,10 @@
return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/heap.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/heap.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/heap.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/heap.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/heap.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/heap.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -6302,10 +6302,10 @@
}
}
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/inout.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/inout.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/inout.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/inout.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/inout.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/inout.c
@@ -46,13 +46,13 @@ along with MMG3D. If not, see <http://ww
#include "mesh.h"
@@ -7645,10 +7645,10 @@
}
}
if (!bin) fprintf(inm,"\n");
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/length.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/length.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/length.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/length.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/length.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/length.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -7969,10 +7969,10 @@
return(1);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/librnbg.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/librnbg.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/librnbg.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/librnbg.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/librnbg.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/librnbg.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -8257,10 +8257,10 @@
-#endif
\ No newline at end of file
+#endif
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/librnbg.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/librnbg.h
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/librnbg.h
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/librnbg.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/librnbg.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/librnbg.h
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -8346,10 +8346,10 @@
-#endif
\ No newline at end of file
+#endif
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/locate.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/locate.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/locate.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/locate.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/locate.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/locate.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -8451,10 +8451,10 @@
return(0);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/matrix.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/matrix.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/matrix.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/matrix.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/matrix.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/matrix.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -8518,10 +8518,10 @@
int MMG_invmat(double *m,double *mi) {
double aa,bb,cc,det,vmin,vmax,maxx;
int k;
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/memory.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/memory.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/memory.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/memory.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/memory.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/memory.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -8725,10 +8725,10 @@
fprintf(stdout," (i.e. %d bytes/point)\n",memsize / np);
}
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/memory.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/memory.h
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/memory.h
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/memory.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/memory.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/memory.h
@@ -22,7 +22,6 @@ Reportez-vous à la licence publique gé
Vous devez avoir reçu une copie de la licence publique générale de GNU
en même temps que ce document.
@@ -8764,10 +8764,10 @@
#ifdef __cplusplus
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mesh.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mesh.h
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/mesh.h
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mesh.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/mesh.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mesh.h
@@ -54,18 +54,18 @@ along with MMG3D. If not, see <http://ww
#include <ctype.h>
#include <math.h>
@@ -8915,10 +8915,10 @@
/* function pointers */
typedef int (*MMG_Swap)(pMesh ,pSol ,pList );
MMG_Swap MMG_swpptr;
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/mmg3d.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/mmg3d.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d.c
@@ -43,21 +43,19 @@ GNU General Public License for more deta
You should have received a copy of the GNU General Public License
along with MMG3D. If not, see <http://www.gnu.org/licenses/>.
@@ -9816,10 +9816,10 @@
+/* M_free(mesh); */
+/* return(0); */
+/* } */
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d1.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d1.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/mmg3d1.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d1.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/mmg3d1.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d1.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -10059,10 +10059,10 @@
if ( mesh->info.imprim < 0 ) {
MMG_outqua(mesh,sol);
MMG_prilen(mesh,sol);
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d4.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d4.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/mmg3d4.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d4.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/mmg3d4.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d4.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -10403,10 +10403,10 @@
return(1);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d9.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d9.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/mmg3d9.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3d9.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/mmg3d9.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3d9.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -11007,10 +11007,10 @@
*/return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3dlib.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3dlib.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/mmg3dlib.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/mmg3dlib.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/mmg3dlib.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/mmg3dlib.c
@@ -43,21 +43,27 @@ GNU General Public License for more deta
You should have received a copy of the GNU General Public License
along with MMG3D. If not, see <http://www.gnu.org/licenses/>.
@@ -11880,10 +11880,10 @@
+ MMG_searchlen(mesh,sol,lmin,lmax,eltab);
+ return(alert);
+}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/movevertex.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/movevertex.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/movevertex.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/movevertex.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/movevertex.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/movevertex.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -12283,10 +12283,10 @@
+ return(1);
+}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optbdry.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optbdry.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/optbdry.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optbdry.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/optbdry.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optbdry.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -12568,10 +12568,10 @@
-
+
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optcoq.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optcoq.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/optcoq.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optcoq.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/optcoq.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optcoq.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -12728,10 +12728,10 @@
nss += ns;
}
while ( ns > 0 && ++it < maxtou );
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optcte.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optcte.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/optcte.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optcte.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/optcte.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optcte.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -13052,10 +13052,10 @@
return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optlap.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optlap.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/optlap.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optlap.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/optlap.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optlap.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -13458,10 +13458,10 @@
} while(it++ < maxiter);
M_free(nv);
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optlen.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optlen.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/optlen.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optlen.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/optlen.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optlen.c
@@ -76,7 +76,10 @@ int MMG_optlen_ani(pMesh mesh,pSol sol,d
pt = &mesh->tetra[k];
if ( !pt->v[0] ) continue;
@@ -13889,10 +13889,10 @@
+ return(nm);
+}
+
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optlentet.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optlentet.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/optlentet.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optlentet.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/optlentet.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optlentet.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -14230,10 +14230,10 @@
+
return(0);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optra4.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optra4.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/optra4.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/optra4.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/optra4.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/optra4.c
@@ -46,12 +46,23 @@ along with MMG3D. If not, see <http://ww
#include "mesh.h"
@@ -14530,10 +14530,10 @@
return(1);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/opttet.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/opttet.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/opttet.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/opttet.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/opttet.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/opttet.c
@@ -76,7 +76,7 @@ int iterworst,nw;
//printf("--------------- iter %d : declicw %e\n",iterworst,declicw*ALPHAD);
//MMG_outqua(mesh,sol);
@@ -14543,10 +14543,10 @@
} while((iterworst++ < 0) && nw);
MMG_outqua(mesh,sol);
puts(" ");
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/opttyp.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/opttyp.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/opttyp.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/opttyp.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/opttyp.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/opttyp.c
@@ -52,17 +52,17 @@ along with MMG3D. If not, see <http://ww
int MMG_colpoi2(pMesh mesh,pSol sol,int iel,int ia,int ib,double coef);
@@ -15355,10 +15355,10 @@
return(nd);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/outqua.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/outqua.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/outqua.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/outqua.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/outqua.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/outqua.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -15807,10 +15807,10 @@
+ }
+ return(iout);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/pattern.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/pattern.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/pattern.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/pattern.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/pattern.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/pattern.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -17598,10 +17598,10 @@
return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/quality.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/quality.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/quality.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/quality.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/quality.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/quality.c
@@ -51,6 +51,297 @@ double MMG_caltetrao(pMesh mesh,pSol sol
return(MMG_rao(mesh,iel,0));
}
@@ -18023,10 +18023,10 @@
+ // caltab[1] = MMG_caltet(mesh,sol,0);
+ return(1);
+}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/queue.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/queue.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/queue.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/queue.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/queue.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/queue.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -18118,10 +18118,10 @@
}
-
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/ratio.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/ratio.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/ratio.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/ratio.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/ratio.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/ratio.c
@@ -43,12 +43,12 @@ GNU General Public License for more deta
You should have received a copy of the GNU General Public License
along with MMG3D. If not, see <http://www.gnu.org/licenses/>.
@@ -18619,10 +18619,10 @@
}
return(1);
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/scalem.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/scalem.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/scalem.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/scalem.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/scalem.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/scalem.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -18814,10 +18814,10 @@
-
-
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu23.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu23.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/simu23.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu23.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/simu23.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu23.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -18894,10 +18894,10 @@
return(1);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu44.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu44.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/simu44.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu44.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/simu44.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu44.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -19052,10 +19052,10 @@
return(42);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu56.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu56.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/simu56.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu56.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/simu56.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu56.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -19491,10 +19491,10 @@
/* set function ptr */
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu68.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu68.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/simu68.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu68.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/simu68.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu68.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -20650,10 +20650,10 @@
+ return(0);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu710.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu710.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/simu710.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/simu710.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/simu710.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/simu710.c
@@ -45,15 +45,15 @@ along with MMG3D. If not, see <http://ww
****************************************************************************/
#include "mesh.h"
@@ -23765,10 +23765,10 @@
- return(0);
+ return(0);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/solmap.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/solmap.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/solmap.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/solmap.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/solmap.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/solmap.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -23950,10 +23950,10 @@
return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/spledg.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/spledg.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/spledg.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/spledg.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/spledg.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/spledg.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -24073,10 +24073,10 @@
}
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/sproto.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/sproto.h
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/sproto.h
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/sproto.h
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/sproto.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/sproto.h
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -24156,10 +24156,10 @@
double MMG_calte3_ani(pMesh mesh,pSol sol,int iel);
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap23.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap23.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/swap23.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap23.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/swap23.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap23.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -25109,10 +25109,10 @@
return(2);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap44.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap44.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/swap44.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap44.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/swap44.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap44.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -25807,10 +25807,10 @@
+
return(4);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap56.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap56.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/swap56.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap56.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/swap56.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap56.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -29110,10 +29110,10 @@
return(6);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap68.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap68.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/swap68.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap68.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/swap68.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap68.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -36473,10 +36473,10 @@
return(8);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap710.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap710.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/swap710.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swap710.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/swap710.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swap710.c
@@ -182,8 +182,8 @@ static int MMG_updatebdryinfo(pMesh mesh
iel = list->tetra[k];
pt1 = &mesh->tetra[iel];
@@ -37287,10 +37287,10 @@
-return(1);
+return(10);
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swapar.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swapar.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/swapar.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swapar.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/swapar.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swapar.c
@@ -1,106 +1,106 @@
-/****************************************************************************
-Logiciel initial: MMG3D Version 4.0
@@ -37504,10 +37504,10 @@
+
+ return(0);
+}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swaptet.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swaptet.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/swaptet.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/swaptet.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/swaptet.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/swaptet.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -37593,10 +37593,10 @@
-
+
}
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/typelt.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/typelt.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/typelt.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/typelt.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/typelt.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/typelt.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -38048,10 +38048,10 @@
item[0] = 0;
//puts("default");
return(1);
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/zaldy.c
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/zaldy.c
===================================================================
---- gmsh-tetgen-2.12.0.orig/contrib/mmg3d/build/sources/zaldy.c
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/zaldy.c
+--- gmsh-tetgen-2.12.2~svn23232.orig/contrib/mmg3d/build/sources/zaldy.c
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/zaldy.c
@@ -3,32 +3,32 @@ Logiciel initial: MMG3D Version 4.0
Co-auteurs : Cecile Dobrzynski et Pascal Frey.
Propriétaires :IPB - UPMC -INRIA.
@@ -38153,10 +38153,10 @@
return(1);
}
-
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/libmmg3d4.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/libmmg3d4.h
===================================================================
--- /dev/null
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/libmmg3d4.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/libmmg3d4.h
@@ -0,0 +1,158 @@
+/****************************************************************************
+Logiciel initial: MMG3D Version 4.0
@@ -38316,10 +38316,10 @@
+#ifdef __cplusplus
+ }}
+#endif
-Index: gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/libmmg3d4_internal.h
+Index: gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/libmmg3d4_internal.h
===================================================================
--- /dev/null
-+++ gmsh-tetgen-2.12.0/contrib/mmg3d/build/sources/libmmg3d4_internal.h
++++ gmsh-tetgen-2.12.2~svn23232/contrib/mmg3d/build/sources/libmmg3d4_internal.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+Logiciel initial: MMG3D Version 4.0
Modified: packages/gmsh-tetgen/trunk/debian/patches/petsc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/petsc.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/petsc.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/petsc.patch Thu Jul 7 07:31:28 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -994,13 +994,26 @@ if(HAVE_SOLVER)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -998,13 +998,26 @@ if(HAVE_SOLVER)
endif(PETSC_PACKAGES_INCLUDES)
endif(PETSC_PACKAGES_INCLUDES)
# find libraries (<= 3.0)
@@ -30,7 +30,7 @@
endif(NOT PETSC_LIBS)
if(PETSC_LIBS)
set_config_option(HAVE_PETSC "PETSc")
-@@ -1018,15 +1031,22 @@ if(HAVE_SOLVER)
+@@ -1022,15 +1035,22 @@ if(HAVE_SOLVER)
else(SLEPC_DIR)
set(ENV_SLEPC_DIR $ENV{SLEPC_DIR})
endif(SLEPC_DIR)
@@ -57,7 +57,7 @@
list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC})
find_path(SLEPC_INC2 "slepcconf.h" PATHS ${ENV_SLEPC_DIR}
PATH_SUFFIXES ${ENV_PETSC_ARCH}/include NO_DEFAULT_PATH)
-@@ -1034,7 +1054,7 @@ if(HAVE_SOLVER)
+@@ -1038,7 +1058,7 @@ if(HAVE_SOLVER)
list(APPEND EXTERNAL_INCLUDES ${SLEPC_INC2})
endif(SLEPC_INC2)
endif(SLEPC_INC)
Modified: packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/python-cmake.patch Thu Jul 7 07:31:28 2016
@@ -23,11 +23,11 @@
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1217,6 +1217,8 @@ endif(ENABLE_ZIPPER)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1221,6 +1221,8 @@ endif(ENABLE_ZIPPER)
if(ENABLE_WRAP_PYTHON)
find_package(SWIG)
find_package(PythonLibs)
Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series Thu Jul 7 07:31:28 2016
@@ -23,5 +23,6 @@
fix-cmake.patch
python-cmake.patch
metis-errormsg.patch
-texinfo.patch
-java.patch
+#texinfo.patch
+#java.patch
+tmp_fix_openfile.patch
Modified: packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/sgeom.patch Thu Jul 7 07:31:28 2016
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1103,8 +1103,8 @@ if(ENABLE_OCC)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1107,8 +1107,8 @@ if(ENABLE_OCC)
# For SGEOM
TKBin TKBinL TKBinTObj TKBinXCAF TKCAF TKCDF TKLCAF TKPLCAF TKMeshVS
TKNIS TKOpenGl TKPCAF TKPShape TKSTL TKService TKShapeSchema TKStdSchema
Modified: packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch Thu Jul 7 07:31:28 2016
@@ -2,11 +2,11 @@
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2011-12-09
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -1555,7 +1555,7 @@ if(UNIX)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -1561,7 +1561,7 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@
set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1722,7 +1722,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1728,7 +1728,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
if(MAKEINFO AND TEXI2PDF)
add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf
${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
Modified: packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch Thu Jul 7 07:31:28 2016
@@ -1,20 +1,15 @@
-Index: gmsh-tetgen-2.12.0/CMakeLists.txt
+Index: gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
===================================================================
---- gmsh-tetgen-2.12.0.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.12.0/CMakeLists.txt
-@@ -792,29 +792,30 @@ if(HAVE_MESH)
+--- gmsh-tetgen-2.12.2~svn23232.orig/CMakeLists.txt
++++ gmsh-tetgen-2.12.2~svn23232/CMakeLists.txt
+@@ -798,20 +798,24 @@ if(HAVE_MESH)
set_config_option(HAVE_MMG3D "Mmg3d")
endif(ENABLE_MMG3D)
- if(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
- add_subdirectory(contrib/Tetgen1.5)
- include_directories(contrib/Tetgen1.5)
-- set_config_option(HAVE_TETGEN "Tetgen(1.5)")
-- add_definitions(-DTETLIBRARY)
-- elseif(ENABLE_TETGEN_OLD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.4/tetgen.h)
-- add_subdirectory(contrib/Tetgen1.4)
-- include_directories(contrib/Tetgen1.4)
-- set_config_option(HAVE_TETGEN "Tetgen(1.4)")
+- set_config_option(HAVE_TETGEN "Tetgen1.5")
- add_definitions(-DTETLIBRARY)
- elseif(ENABLE_TETGEN)
+ if(ENABLE_TETGEN)
@@ -24,27 +19,18 @@
list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
set_config_option(HAVE_TETGEN "Tetgen")
-+ message(STATUS "Using system Tetgen")
-+ elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
-+ add_subdirectory(contrib/Tetgen1.5)
-+ include_directories(contrib/Tetgen1.5)
-+ message(STATUS "Using contrib/Tetgen1.5")
++ else(TETGEN_LIB AND TETGEN_INC)
++ if(${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
++ add_subdirectory(contrib/Tetgen1.5)
++ include_directories(contrib/Tetgen1.5)
++ set_config_option(HAVE_TETGEN "Tetgen1.5")
++ else(${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
++ message(STATUS "cannot find contrib/Tetgen1.5/tetgen.h")
++ endif(${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
endif(TETGEN_LIB AND TETGEN_INC)
- endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
-- if(HAVE_TETGEN)
-+ set_config_option(HAVE_TETGEN "Tetgen(1.5)")
+ add_definitions(-DTETLIBRARY)
-+ elseif(ENABLE_TETGEN_OLD AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.4/tetgen.h)
-+ add_subdirectory(contrib/Tetgen1.4)
-+ include_directories(contrib/Tetgen1.4)
-+ set_config_option(HAVE_TETGEN "Tetgen(1.4)")
-+ add_definitions(-DTETLIBRARY)
-+
++ endif(ENABLE_TETGEN)
+ if(HAVE_TETGEN)
message(STATUS "Note: By including Tetgen you have to comply with Tetgen's "
-- "special licensing requirements stated in contrib/Tetgen*/LICENSE.")
-- endif(HAVE_TETGEN)
-+ "special licensing requirements stated in contrib/Tetgen1.4/LICENSE.")
-+ endif(ENABLE_TETGEN)
- endif(HAVE_MESH)
-
- if(ENABLE_FOURIER_MODEL)
+ "special licensing requirements stated in contrib/Tetgen1.5/LICENSE.")
Modified: packages/gmsh-tetgen/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/rules?rev=47312&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/rules (original)
+++ packages/gmsh-tetgen/trunk/debian/rules Thu Jul 7 07:31:28 2016
@@ -22,6 +22,7 @@
# -DENABLE_PETSC4PY:BOOL=OFF: fails when no petsc4py
extra_flags += \
+-DENABLE_GRAPHICS:BOOL=ON \
-DENABLE_KBIPACK:BOOL=ON \
-DENABLE_METIS:BOOL=ON \
-DENABLE_TAUCS:BOOL=OFF \
More information about the debian-science-commits
mailing list