[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, experimental, updated. debian/2.6.2_beta2_svn14562_dfsg-1_exp1-9-g24b26fd
Anton Gladky
gladky.anton at gmail.com
Sun Mar 10 16:57:18 UTC 2013
The following commit has been merged in the experimental branch:
commit ac7e1f815c3b00aa29941d52b3e6b8bf3b54bd07
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sat Mar 9 22:35:53 2013 +0100
Refresh patches.
diff --git a/debian/patches/alauzet.patch b/debian/patches/alauzet.patch
index 81953ed..c5b4c7b 100644
--- a/debian/patches/alauzet.patch
+++ b/debian/patches/alauzet.patch
@@ -196,7 +196,7 @@
}
return v;
}
-@@ -2038,6 +2184,7 @@
+@@ -2015,6 +2161,7 @@
#endif
map_type_name["Box"] = new FieldFactoryT<BoxField>();
map_type_name["Cylinder"] = new FieldFactoryT<CylinderField>();
@@ -204,7 +204,7 @@
map_type_name["Frustum"] = new FieldFactoryT<FrustumField>();
map_type_name["LonLat"] = new FieldFactoryT<LonLatField>();
#if defined(HAVE_POST)
-@@ -2047,6 +2194,7 @@
+@@ -2024,6 +2171,7 @@
map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
map_type_name["Min"] = new FieldFactoryT<MinField>();
map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
@@ -225,7 +225,7 @@
const double t);
--- a/Geo/STensor3.cpp
+++ b/Geo/STensor3.cpp
-@@ -40,6 +40,27 @@
+@@ -48,6 +48,27 @@
return iv;
}
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 57b04cc..015641d 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -19,27 +19,21 @@ Last-Update: 2012-11-28
POST_BUILD # do the rest of the command after the build period
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1043,7 +1043,10 @@
+@@ -1048,7 +1048,7 @@
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
- set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
-+ set_target_properties(lib PROPERTIES
-+ OUTPUT_NAME gmsh
-+ SOVERSION "${GMSH_MAJOR_VERSION}"
-+ )
++ set_target_properties(lib PROPERTIES OUTPUT_NAME gmsh)
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1055,7 +1058,10 @@
+@@ -1060,7 +1060,7 @@
# shared library target
if(ENABLE_BUILD_SHARED 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
-+ 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)
++ 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})
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 88ec554..e005b06 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,7 +14,7 @@ Last-Update: 2012-11-28
gl2png.cpp
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1085,7 +1085,7 @@
+@@ -1087,7 +1087,7 @@
add_executable(gmsh_dynamic EXCLUDE_FROM_ALL Common/Main.cpp)
target_link_libraries(gmsh_dynamic shared)
endif(HAVE_FLTK)
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
index fb42dc4..f13aa34 100644
--- a/debian/patches/fix_FTBFS_linking.patch
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1085,7 +1085,7 @@
+@@ -1087,7 +1087,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)
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index 4177bb9..7af2581 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1128,7 +1128,7 @@
+@@ -1130,7 +1130,7 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +13,7 @@ Last-Update: 2012-11-28
set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
file(GLOB DEMO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/demos/?*.*)
-@@ -1234,7 +1234,7 @@
+@@ -1236,7 +1236,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 cda3f16..045d6cf 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
-@@ -842,15 +842,6 @@
+@@ -847,15 +847,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
-@@ -861,6 +852,30 @@
+@@ -866,6 +857,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})
-@@ -896,6 +911,7 @@
+@@ -901,6 +916,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