[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.7.0.dfsg-1-5-g17c9976
Anton Gladky
gladky.anton at gmail.com
Sat May 11 22:51:43 UTC 2013
The following commit has been merged in the master branch:
commit 17c99769c60ac3156506bc9f73289e863435bc0e
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sun May 12 00:51:30 2013 +0200
Refresh patches.
diff --git a/debian/patches/alauzet.patch b/debian/patches/alauzet.patch
index c5b4c7b..866c000 100644
--- a/debian/patches/alauzet.patch
+++ b/debian/patches/alauzet.patch
@@ -1,6 +1,6 @@
--- a/Mesh/Field.cpp
+++ b/Mesh/Field.cpp
-@@ -479,6 +479,55 @@
+@@ -531,6 +531,55 @@
}
};
@@ -56,7 +56,7 @@
class FrustumField : public Field
{
double x1,y1,z1;
-@@ -1280,17 +1329,21 @@
+@@ -1332,17 +1381,21 @@
}
virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
{
@@ -78,7 +78,7 @@
}
v = intersection_conserve_mostaniso(v,ff);
}
-@@ -1328,6 +1381,77 @@
+@@ -1380,6 +1433,77 @@
}
};
@@ -156,7 +156,7 @@
class MinField : public Field
{
std::list<int> idlist;
-@@ -1346,7 +1470,18 @@
+@@ -1398,7 +1522,18 @@
double v = MAX_LC;
for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
Field *f = (GModel::current()->getFields()->get(*it));
@@ -176,7 +176,7 @@
}
return v;
}
-@@ -1374,7 +1509,18 @@
+@@ -1426,7 +1561,18 @@
double v = -MAX_LC;
for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
Field *f = (GModel::current()->getFields()->get(*it));
@@ -196,15 +196,15 @@
}
return v;
}
-@@ -2015,6 +2161,7 @@
+@@ -2112,6 +2258,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)
-@@ -2024,6 +2171,7 @@
+ map_type_name["XY2d2LonLat"] = new FieldFactoryT<XY2d2LonLatField>();
+@@ -2122,6 +2269,7 @@
map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
map_type_name["Min"] = new FieldFactoryT<MinField>();
map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
@@ -214,7 +214,7 @@
map_type_name["Laplacian"] = new FieldFactoryT<LaplacianField>();
--- a/Geo/STensor3.h
+++ b/Geo/STensor3.h
-@@ -172,6 +172,8 @@
+@@ -173,6 +173,8 @@
// compute the largest inscribed ellipsoid...
SMetric3 intersection (const SMetric3 &m1,
const SMetric3 &m2);
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 043ee09..d7325e7 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -19,7 +19,7 @@ Last-Update: 2012-11-28
POST_BUILD # do the rest of the command after the build period
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1048,7 +1048,7 @@
+@@ -1110,7 +1110,7 @@
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -28,16 +28,16 @@ Last-Update: 2012-11-28
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1060,10 +1060,10 @@
- # shared library target
- if(ENABLE_BUILD_SHARED OR ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
+@@ -1123,10 +1123,10 @@
+ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
+ ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
- set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
+ set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh)
set_target_properties(shared PROPERTIES
- VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
-- SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
-+ SOVERSION ${GMSH_MAJOR_VERSION})
+ VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
+- SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
++ SOVERSION ${GMSH_MAJOR_VERSION})
if(HAVE_LAPACK AND LAPACK_FLAGS)
set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
endif(HAVE_LAPACK AND LAPACK_FLAGS)
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index e005b06..604fe9e 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,12 +14,12 @@ Last-Update: 2012-11-28
gl2png.cpp
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1087,7 +1087,7 @@
- add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
- target_link_libraries(gmsh_dynamic shared)
+@@ -1157,7 +1157,7 @@
+ add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
+ endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
-target_link_libraries(gmsh ${LINK_LIBRARIES})
+target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
- # increase stack to 16Mb on Windows to avoid overflows in recursive
- # tet classification for large 3D Delaunay grids + force static
+ # Windows specific linker options
+ if(WIN32 AND NOT MSVC OR CYGWIN)
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
index f13aa34..1facd2e 100644
--- a/debian/patches/fix_FTBFS_linking.patch
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -4,12 +4,12 @@ Last-Update: 2012-11-28
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1087,7 +1087,7 @@
+@@ -1150,7 +1150,7 @@
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)
- target_link_libraries(shared ${LINK_LIBRARIES})
+ target_link_libraries(shared ${LINK_LIBRARIES} -shared -lgl2ps -lGL -lglut)
- endif(ENABLE_BUILD_SHARED OR ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
+ endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
+ ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
- # binary targets
diff --git a/debian/patches/fix_libdir.patch b/debian/patches/fix_libdir.patch
index 437ca32..08f2e5e 100644
--- a/debian/patches/fix_libdir.patch
+++ b/debian/patches/fix_libdir.patch
@@ -2,21 +2,6 @@ Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1208,10 +1208,10 @@
- # (e.g. "make lib" or "make shared" followed by "make install/fast")
- install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
- if(ENABLE_BUILD_LIB)
-- install(TARGETS lib DESTINATION lib OPTIONAL)
-+ install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- endif(ENABLE_BUILD_LIB)
- if(ENABLE_BUILD_SHARED)
-- install(TARGETS shared DESTINATION lib OPTIONAL)
-+ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
- endif(ENABLE_BUILD_SHARED)
- install(FILES ${GMSH_API} DESTINATION include/gmsh)
- install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
--- a/wrappers/java/CMakeLists.txt
+++ b/wrappers/java/CMakeLists.txt
@@ -73,6 +73,6 @@
@@ -28,3 +13,18 @@ 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
+@@ -1289,10 +1289,10 @@
+ # (e.g. "make lib" or "make shared" followed by "make install/fast")
+ install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
+ if(ENABLE_BUILD_LIB)
+- install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
++ install(TARGETS lib DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(ENABLE_BUILD_LIB)
+ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+- install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
++ install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
+ endif(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+
+ install(FILES ${ONELAB_PY} DESTINATION ${GMSH_BIN})
diff --git a/debian/patches/fix_spelling_errors.patch b/debian/patches/fix_spelling_errors.patch
index 9a6cdf9..3ecc049 100644
--- a/debian/patches/fix_spelling_errors.patch
+++ b/debian/patches/fix_spelling_errors.patch
@@ -39,7 +39,7 @@ Last-Update: 2011-12-09
* beta*y
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
-@@ -1402,7 +1402,7 @@
+@@ -1093,7 +1093,7 @@
etc.). The eigth case permits to use the value of a @var{char-option} as
a @var{char-expression}. The ninth case gets the value of an environment
variable from the operating system. The last case in the definition
@@ -48,7 +48,7 @@ Last-Update: 2011-12-09
@w{@var{char-option}s} are listed in @ref{Options}.
Character expressions are mostly used to specify non-numeric options and
-@@ -2935,7 +2935,7 @@
+@@ -2628,7 +2628,7 @@
@item Extrude @{ Surface @{ @var{expression-list} @}; @var{layers} < Using Index[@var{expr}]; > < Using View[@var{expr}]; > @}
Extrudes a boundary layer from the specified surfaces. If no view is
specified, the boundary layer is created using gouraud-shaped (smoothed)
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index 7af2581..ff9e033 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -4,16 +4,16 @@ Last-Update: 2012-11-28
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1130,7 +1130,7 @@
+@@ -1206,7 +1206,7 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
-set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
+#set(LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/LICENSE.txt)
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/?*.*)
- file(GLOB DEMO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/demos/?*.*)
-@@ -1236,7 +1236,7 @@
+@@ -1329,7 +1329,7 @@
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 045d6cf..3d7efa6 100644
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-02-10
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -847,15 +847,6 @@
+@@ -889,15 +889,6 @@
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -22,7 +22,7 @@ Last-Update: 2012-02-10
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -866,6 +857,30 @@
+@@ -908,6 +899,30 @@
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
TKAdvTools TKMath TKernel)
@@ -53,7 +53,7 @@ Last-Update: 2012-02-10
list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
set(OCC_LIBS)
foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -901,6 +916,7 @@
+@@ -943,6 +958,7 @@
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
--
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.
More information about the debian-science-commits
mailing list