[gmsh] 02/06: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jul 25 21:21:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit d31524d5b38bfe399a793265a7082e77d02df287
Author: Anton Gladky <gladk at debian.org>
Date: Fri Jul 25 20:38:08 2014 +0200
Refresh patches.
---
debian/patches/alauzet.patch | 115 +++++----------------
debian/patches/change_shared_library_name.patch | 18 ++--
debian/patches/delete_gl2ps_from_source.patch | 16 +--
debian/patches/enable_tetgen.patch | 12 ++-
debian/patches/fix_FTBFS_linking.patch | 8 +-
debian/patches/fix_gmshpy_import.patch | 6 +-
debian/patches/fix_java_wrapper_compilation.patch | 8 +-
debian/patches/fix_libdir.patch | 18 ++--
debian/patches/fix_script_header.patch | 10 +-
debian/patches/skip_license_file.patch | 10 +-
.../patches/switch_from_opencascade_to_oce.patch | 12 ++-
11 files changed, 98 insertions(+), 135 deletions(-)
diff --git a/debian/patches/alauzet.patch b/debian/patches/alauzet.patch
index 15c0fb2..6dc5c76 100644
--- a/debian/patches/alauzet.patch
+++ b/debian/patches/alauzet.patch
@@ -1,6 +1,8 @@
---- a/Mesh/Field.cpp
-+++ b/Mesh/Field.cpp
-@@ -485,6 +485,55 @@
+Index: gmsh-2.8.5-source/Mesh/Field.cpp
+===================================================================
+--- gmsh-2.8.5-source.orig/Mesh/Field.cpp
++++ gmsh-2.8.5-source/Mesh/Field.cpp
+@@ -534,6 +534,55 @@ class SphereField : public Field
}
};
@@ -56,7 +58,7 @@
class FrustumField : public Field
{
double x1,y1,z1;
-@@ -1286,17 +1335,21 @@
+@@ -1340,17 +1389,21 @@ class MinAnisoField : public Field
}
virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
{
@@ -78,10 +80,19 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-@@ -1334,6 +1387,77 @@
- }
- };
-
+@@ -1449,6 +1502,77 @@ class IntersectAnisoField : public Field
+ }
+ fullMatrix<double> V(3,3);
+ fullVector<double> S(3);
++ metr.eig(V, S, 1);
++ return sqrt(1./S(2)); //S(2) is largest eigenvalue
++ }
++ const char *getName()
++ {
++ return "IntersectAniso";
++ }
++};
++
+class IntersectAnisoField : public Field
+{
+ std::list<int> idlist;
@@ -144,88 +155,14 @@
+ }
+ fullMatrix<double> V(3,3);
+ fullVector<double> S(3);
-+ metr.eig(V, S, 1);
-+ return sqrt(1./S(2)); //S(2) is largest eigenvalue
-+ }
-+ const char *getName()
-+ {
-+ return "IntersectAniso";
-+ }
-+};
-+
- class MinField : public Field
- {
- std::list<int> idlist;
-@@ -1352,7 +1476,18 @@
- double v = MAX_LC;
- for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
- Field *f = (GModel::current()->getFields()->get(*it));
-- if(f && *it != id) v = std::min(v, (*f) (x, y, z, ge));
-+ if(f && *it != id) {
-+ if (f->isotropic())
-+ v = std::min(v, (*f) (x, y, z, ge));
-+ else{
-+ SMetric3 ff;
-+ (*f) (x, y, z, ff, ge);
-+ fullMatrix<double> V(3,3);
-+ fullVector<double> S(3);
-+ ff.eig(V, S, 1);
-+ v = std::min(v, sqrt(1./S(2))); //S(2) is largest eigenvalue
-+ }
-+ }
- }
- return v;
- }
-@@ -1380,7 +1515,18 @@
- double v = -MAX_LC;
- for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
- Field *f = (GModel::current()->getFields()->get(*it));
-- if(f && *it != id) v = std::max(v, (*f) (x, y, z, ge));
-+ if(f && *it != id) {
-+ if (f->isotropic())
-+ v = std::max(v, (*f) (x, y, z, ge));
-+ else{
-+ SMetric3 ff;
-+ (*f) (x, y, z, ff, ge);
-+ fullMatrix<double> V(3,3);
-+ fullVector<double> S(3);
-+ ff.eig(V, S, 1);
-+ v = std::max(v, sqrt(1./S(0))); //S(0) is smallest eigenvalue
-+ }
-+ }
- }
- return v;
+ metr.eig(V, S, 1);
+ return sqrt(1./S(2)); //S(2) is largest eigenvalue
}
-@@ -2154,6 +2300,7 @@
- #endif
- map_type_name["Box"] = new FieldFactoryT<BoxField>();
- map_type_name["Cylinder"] = new FieldFactoryT<CylinderField>();
-+ map_type_name["Sphere"] = new FieldFactoryT<SphereField>();
- map_type_name["Frustum"] = new FieldFactoryT<FrustumField>();
- map_type_name["LonLat"] = new FieldFactoryT<LonLatField>();
- #if defined(HAVE_POST)
-@@ -2163,6 +2310,7 @@
- map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
- map_type_name["Min"] = new FieldFactoryT<MinField>();
- map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
-+ map_type_name["IntersectAniso"] = new FieldFactoryT<IntersectAnisoField>();
- map_type_name["Max"] = new FieldFactoryT<MaxField>();
- map_type_name["Laplacian"] = new FieldFactoryT<LaplacianField>();
- map_type_name["Mean"] = new FieldFactoryT<MeanField>();
---- a/Geo/STensor3.h
-+++ b/Geo/STensor3.h
-@@ -173,6 +173,8 @@
- // compute the largest inscribed ellipsoid...
- SMetric3 intersection (const SMetric3 &m1,
- const SMetric3 &m2);
-+SMetric3 intersection_alauzet (const SMetric3 &m1,
-+ const SMetric3 &m2);
- SMetric3 interpolation (const SMetric3 &m1,
- const SMetric3 &m2,
- const double t);
---- a/Geo/STensor3.cpp
-+++ b/Geo/STensor3.cpp
-@@ -48,6 +48,27 @@
+Index: gmsh-2.8.5-source/Geo/STensor3.cpp
+===================================================================
+--- gmsh-2.8.5-source.orig/Geo/STensor3.cpp
++++ gmsh-2.8.5-source/Geo/STensor3.cpp
+@@ -69,6 +69,27 @@ SMetric3 intersection_alauzet (const SMe
return iv;
}
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 9ea837e..5e99b58 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -2,9 +2,11 @@ Description: Change name of shared library
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
---- a/wrappers/java/CMakeLists.txt
-+++ b/wrappers/java/CMakeLists.txt
-@@ -34,7 +34,11 @@
+Index: gmsh-2.8.5-source/wrappers/java/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.8.5-source/wrappers/java/CMakeLists.txt
+@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
if(UNIX)
@@ -17,9 +19,11 @@ Last-Update: 2012-11-28
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1274,7 +1274,7 @@
+Index: gmsh-2.8.5-source/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/CMakeLists.txt
++++ gmsh-2.8.5-source/CMakeLists.txt
+@@ -1299,7 +1299,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -28,7 +32,7 @@ Last-Update: 2012-11-28
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1287,10 +1287,10 @@
+@@ -1326,10 +1326,10 @@ 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})
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 457121c..41849df 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -2,9 +2,11 @@ Description: delete gl2ps and use packaged version.
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2012-11-28
---- a/Graphics/CMakeLists.txt
-+++ b/Graphics/CMakeLists.txt
-@@ -15,7 +15,6 @@
+Index: gmsh-2.8.5-source/Graphics/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/Graphics/CMakeLists.txt
++++ gmsh-2.8.5-source/Graphics/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
drawGlyph.cpp
@@ -12,9 +14,11 @@ Last-Update: 2012-11-28
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1321,7 +1321,7 @@
+Index: gmsh-2.8.5-source/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/CMakeLists.txt
++++ gmsh-2.8.5-source/CMakeLists.txt
+@@ -1360,7 +1360,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
diff --git a/debian/patches/enable_tetgen.patch b/debian/patches/enable_tetgen.patch
index ac9f03e..571674e 100644
--- a/debian/patches/enable_tetgen.patch
+++ b/debian/patches/enable_tetgen.patch
@@ -2,9 +2,11 @@ Description: Enable TetGen
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2014-02-10
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -760,6 +760,7 @@
+Index: gmsh-2.8.5-source/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/CMakeLists.txt
++++ gmsh-2.8.5-source/CMakeLists.txt
+@@ -764,6 +764,7 @@ if(HAVE_MESH)
list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
set_config_option(HAVE_TETGEN "Tetgen")
@@ -12,7 +14,7 @@ Last-Update: 2014-02-10
endif(TETGEN_LIB AND TETGEN_INC)
endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
if(HAVE_TETGEN)
-@@ -1314,7 +1315,7 @@
+@@ -1353,7 +1354,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)
@@ -21,7 +23,7 @@ Last-Update: 2014-02-10
endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
-@@ -1337,7 +1338,7 @@
+@@ -1376,7 +1377,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
index 4c7ed3f..cf54ad7 100644
--- a/debian/patches/fix_FTBFS_linking.patch
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -2,9 +2,11 @@ Description: this linking causes a FTBFS
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1314,7 +1314,7 @@
+Index: gmsh-2.8.5-source/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/CMakeLists.txt
++++ gmsh-2.8.5-source/CMakeLists.txt
+@@ -1353,7 +1353,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)
diff --git a/debian/patches/fix_gmshpy_import.patch b/debian/patches/fix_gmshpy_import.patch
index b88d755..19b14f7 100644
--- a/debian/patches/fix_gmshpy_import.patch
+++ b/debian/patches/fix_gmshpy_import.patch
@@ -3,8 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/696420
Last-Update: 2014-02-06
---- a/wrappers/gmshpy/__init__.py.in
-+++ b/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.8.5-source/wrappers/gmshpy/__init__.py.in
+===================================================================
+--- gmsh-2.8.5-source.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.8.5-source/wrappers/gmshpy/__init__.py.in
@@ -1,4 +1,7 @@
# set Ctrl-C to default signal (terminates immediately)
+from ctypes import *
diff --git a/debian/patches/fix_java_wrapper_compilation.patch b/debian/patches/fix_java_wrapper_compilation.patch
index 06117a0..f3ba94f 100644
--- a/debian/patches/fix_java_wrapper_compilation.patch
+++ b/debian/patches/fix_java_wrapper_compilation.patch
@@ -2,9 +2,11 @@ Description: <short summary of the patch>
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-07-24
---- a/wrappers/java/CMakeLists.txt
-+++ b/wrappers/java/CMakeLists.txt
-@@ -13,7 +13,7 @@
+Index: gmsh-2.8.5-source/wrappers/java/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.8.5-source/wrappers/java/CMakeLists.txt
+@@ -13,7 +13,7 @@ include_directories(${JAVA_INCLUDE_PATH}
include_directories(${JAVA_INCLUDE_PATH2})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
# define where the interface file (used by SWIG) are
diff --git a/debian/patches/fix_libdir.patch b/debian/patches/fix_libdir.patch
index a2a29de..65cec65 100644
--- a/debian/patches/fix_libdir.patch
+++ b/debian/patches/fix_libdir.patch
@@ -2,9 +2,11 @@ Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
---- a/wrappers/java/CMakeLists.txt
-+++ b/wrappers/java/CMakeLists.txt
-@@ -73,6 +73,6 @@
+Index: gmsh-2.8.5-source/wrappers/java/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.8.5-source/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
${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
@@ -13,9 +15,11 @@ Last-Update: 2013-03-15
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1454,7 +1454,7 @@
+Index: gmsh-2.8.5-source/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/CMakeLists.txt
++++ gmsh-2.8.5-source/CMakeLists.txt
+@@ -1494,7 +1494,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)
@@ -24,7 +28,7 @@ Last-Update: 2013-03-15
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1490,7 +1490,7 @@
+@@ -1530,7 +1530,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)
diff --git a/debian/patches/fix_script_header.patch b/debian/patches/fix_script_header.patch
index d6adb26..9d25cb1 100644
--- a/debian/patches/fix_script_header.patch
+++ b/debian/patches/fix_script_header.patch
@@ -2,14 +2,16 @@ Description: add header into onelab
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
---- a/contrib/onelab/python/onelab.py
-+++ b/contrib/onelab/python/onelab.py
-@@ -27,6 +27,8 @@
+Index: gmsh-2.8.5-source/contrib/onelab/python/onelab.py
+===================================================================
+--- gmsh-2.8.5-source.orig/contrib/onelab/python/onelab.py
++++ gmsh-2.8.5-source/contrib/onelab/python/onelab.py
+@@ -27,6 +27,8 @@ Please report all bugs and problems to t
<gmsh at geuz.org>.
"""
+#!/usr/bin/env python
+
import socket, struct, os, sys, subprocess
- _VERSION = '1.05'
+ _VERSION = '1.1'
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index e4cf790..a2fd2d3 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -2,9 +2,11 @@ Description: skips LICENSE.txt during installation. All information is in debian
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1371,7 +1371,7 @@
+Index: gmsh-2.8.5-source/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/CMakeLists.txt
++++ gmsh-2.8.5-source/CMakeLists.txt
+@@ -1411,7 +1411,7 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +15,7 @@ Last-Update: 2012-11-28
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/?*.*)
-@@ -1535,7 +1535,7 @@
+@@ -1576,7 +1576,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
diff --git a/debian/patches/switch_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
index d556f69..69f1f32 100644
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -4,9 +4,11 @@ Author: D. Barbier <bouzim at gmail.com>
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-02-10
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -989,15 +989,6 @@
+Index: gmsh-2.8.5-source/CMakeLists.txt
+===================================================================
+--- gmsh-2.8.5-source.orig/CMakeLists.txt
++++ gmsh-2.8.5-source/CMakeLists.txt
+@@ -999,15 +999,6 @@ if(HAVE_SOLVER)
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -22,7 +24,7 @@ Last-Update: 2012-02-10
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -1008,6 +999,30 @@
+@@ -1018,6 +1009,30 @@ if(ENABLE_OCC)
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
TKAdvTools TKMath TKernel)
@@ -53,7 +55,7 @@ Last-Update: 2012-02-10
if(ENABLE_SGEOM)
set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
# For SGEOM
-@@ -1051,6 +1066,7 @@
+@@ -1061,6 +1076,7 @@ if(ENABLE_OCC)
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list