[gmsh] 02/02: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Sat Feb 8 20:04:22 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 85f9ea75b76af6f9e397708d1900daa2ff37f953
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sat Feb 8 21:04:12 2014 +0100
Refresh patches.
---
debian/patches/alauzet.patch | 4 ++--
debian/patches/change_shared_library_name.patch | 4 ++--
debian/patches/delete_gl2ps_from_source.patch | 2 +-
debian/patches/fix_FTBFS_linking.patch | 2 +-
debian/patches/fix_libdir.patch | 4 ++--
debian/patches/fix_onelab_issue.patch | 16 ----------------
debian/patches/fix_script_header.patch | 8 ++++----
debian/patches/series | 1 -
debian/patches/skip_license_file.patch | 4 ++--
debian/patches/switch_from_opencascade_to_oce.patch | 6 +++---
10 files changed, 17 insertions(+), 34 deletions(-)
diff --git a/debian/patches/alauzet.patch b/debian/patches/alauzet.patch
index e790d1d..15c0fb2 100644
--- a/debian/patches/alauzet.patch
+++ b/debian/patches/alauzet.patch
@@ -196,7 +196,7 @@
}
return v;
}
-@@ -2148,6 +2294,7 @@
+@@ -2154,6 +2300,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)
-@@ -2157,6 +2304,7 @@
+@@ -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>();
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index f81ce46..9ea837e 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
-@@ -1182,7 +1182,7 @@
+@@ -1274,7 +1274,7 @@
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -28,7 +28,7 @@ Last-Update: 2012-11-28
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1195,10 +1195,10 @@
+@@ -1287,10 +1287,10 @@
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 8a787e7..457121c 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
-@@ -1229,7 +1229,7 @@
+@@ -1321,7 +1321,7 @@
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 cbaf3bf..4c7ed3f 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
-@@ -1222,7 +1222,7 @@
+@@ -1314,7 +1314,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/fix_libdir.patch b/debian/patches/fix_libdir.patch
index 236dbaa..a2a29de 100644
--- a/debian/patches/fix_libdir.patch
+++ b/debian/patches/fix_libdir.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-03-15
+ DESTINATION ${INSTALL_LIB_DIR})
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -1362,7 +1362,7 @@
+@@ -1454,7 +1454,7 @@
# (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 +24,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)
-@@ -1402,7 +1402,7 @@
+@@ -1490,7 +1490,7 @@
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_onelab_issue.patch b/debian/patches/fix_onelab_issue.patch
deleted file mode 100644
index 2106e38..0000000
--- a/debian/patches/fix_onelab_issue.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix an issue in onelabparser
-Author: Alexandre Ancel <alexandre.ancel at cemosis.fr>
-Reviewed-By: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-09-30
-
---- a/contrib/onelab/OnelabParser.cpp
-+++ b/contrib/onelab/OnelabParser.cpp
-@@ -591,7 +591,7 @@
- strings[0].setNeverChanged(true);
- }
- else
-- std::string val=resolveGetVal(arguments[0]);
-+ val=resolveGetVal(arguments[0]);
- strings[0].setValue(val);
- }
- // choices list is reset
diff --git a/debian/patches/fix_script_header.patch b/debian/patches/fix_script_header.patch
index da95e50..d6adb26 100644
--- a/debian/patches/fix_script_header.patch
+++ b/debian/patches/fix_script_header.patch
@@ -4,12 +4,12 @@ Last-Update: 2013-05-12
--- a/contrib/onelab/python/onelab.py
+++ b/contrib/onelab/python/onelab.py
-@@ -26,7 +26,7 @@
- Please report all bugs and problems to the public mailing list
+@@ -27,6 +27,8 @@
<gmsh at geuz.org>.
"""
--
+
+#!/usr/bin/env python
- import socket, struct, os, sys
++
+ import socket, struct, os, sys, subprocess
_VERSION = '1.05'
diff --git a/debian/patches/series b/debian/patches/series
index 6e420de..229a78f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ fix_gmshpy_import.patch
fix_libdir.patch
fix_script_header.patch
fix_java_wrapper_compilation.patch
-fix_onelab_issue.patch
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index 390add8..e4cf790 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
-@@ -1279,7 +1279,7 @@
+@@ -1371,7 +1371,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)
set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1445,7 +1445,7 @@
+@@ -1535,7 +1535,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 4c3ade5..d556f69 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
-@@ -925,15 +925,6 @@
+@@ -989,15 +989,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
-@@ -944,6 +935,30 @@
+@@ -1008,6 +999,30 @@
TKBRep TKGeomBase TKG3d TKG2d
# FoundationClasses
TKAdvTools TKMath TKernel)
@@ -53,7 +53,7 @@ Last-Update: 2012-02-10
if(ENABLE_SGEOM)
set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
# For SGEOM
-@@ -987,6 +1002,7 @@
+@@ -1051,6 +1066,7 @@
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