[gmsh] 02/06: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jan 11 18:01:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 68a07dd15d368db4fc0171bc411c3a152ad4274e
Author: Anton Gladky <gladk at debian.org>
Date: Sun Jan 3 00:24:47 2016 +0100
Refresh patches.
---
debian/patches/100_enable_tetgen.patch | 10 +++++-----
debian/patches/10_change_shared_library_name.patch | 16 ++++++++--------
debian/patches/110_fix_cmake_hdf5.patch | 10 +++++-----
debian/patches/120_relax_python_vers.patch | 8 ++++----
debian/patches/20_skip_license_file.patch | 10 +++++-----
debian/patches/30_delete_gl2ps_from_source.patch | 14 +++++++-------
debian/patches/40_switch_from_opencascade_to_oce.patch | 12 ++++++------
debian/patches/60_fix_gmshpy_import.patch | 6 +++---
debian/patches/70_fix_libdir.patch | 16 ++++++++--------
debian/patches/80_fix_script_header.patch | 6 +++---
debian/patches/90_fix_java_wrapper_compilation.patch | 6 +++---
11 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/debian/patches/100_enable_tetgen.patch b/debian/patches/100_enable_tetgen.patch
index 544ba0d..4cd2548 100644
--- a/debian/patches/100_enable_tetgen.patch
+++ b/debian/patches/100_enable_tetgen.patch
@@ -2,11 +2,11 @@ Description: Enable TetGen
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2014-02-10
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -818,6 +818,7 @@ if(HAVE_MESH)
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -830,6 +830,7 @@ if(HAVE_MESH)
list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
set_config_option(HAVE_TETGEN "Tetgen")
@@ -14,7 +14,7 @@ Index: gmsh-2.10.1-source_repack/CMakeLists.txt
endif(TETGEN_LIB AND TETGEN_INC)
endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
if(HAVE_TETGEN)
-@@ -1463,7 +1464,7 @@ else(HAVE_FLTK)
+@@ -1515,7 +1516,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index 4b4268c..dcf3118 100644
--- a/debian/patches/10_change_shared_library_name.patch
+++ b/debian/patches/10_change_shared_library_name.patch
@@ -2,10 +2,10 @@ Description: Change name of shared library
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
+Index: gmsh-2.11.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
+--- gmsh-2.11.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.11.0-source/wrappers/java/CMakeLists.txt
@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
@@ -19,11 +19,11 @@ Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
endif(UNIX)
add_custom_command(TARGET WrapGmsh
POST_BUILD # do the rest of the command after the build period
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -1386,7 +1386,7 @@ endforeach(DIR)
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -1438,7 +1438,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@ Index: gmsh-2.10.1-source_repack/CMakeLists.txt
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1413,10 +1413,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1465,10 +1465,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/110_fix_cmake_hdf5.patch b/debian/patches/110_fix_cmake_hdf5.patch
index 3d8991f..664147b 100644
--- a/debian/patches/110_fix_cmake_hdf5.patch
+++ b/debian/patches/110_fix_cmake_hdf5.patch
@@ -1,9 +1,9 @@
Description: _fix_cmake_hdf5
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -837,8 +837,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -849,8 +849,10 @@ if(ENABLE_FOURIER_MODEL)
endif(ENABLE_FOURIER_MODEL)
if(ENABLE_MED OR ENABLE_CGNS)
@@ -16,7 +16,7 @@ Index: gmsh-2.10.1-source_repack/CMakeLists.txt
if(ENABLE_MED)
find_library(MED_LIB med)
if(MED_LIB)
-@@ -869,9 +871,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -881,9 +883,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
endif(ZLIB_FOUND)
endif(NOT HAVE_LIBZ)
endif(MED_LIB OR CGNS_LIB)
diff --git a/debian/patches/120_relax_python_vers.patch b/debian/patches/120_relax_python_vers.patch
index ee7d97c..ff5453a 100644
--- a/debian/patches/120_relax_python_vers.patch
+++ b/debian/patches/120_relax_python_vers.patch
@@ -2,11 +2,11 @@ Description: relax check of python libraries
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-05-26
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -1184,7 +1184,7 @@ endif(HAVE_ZLIB AND ENABLE_COMPRESSED_IO
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -1215,7 +1215,7 @@ endif(ENABLE_ZIPPER)
if(ENABLE_WRAP_PYTHON)
find_package(SWIG)
find_package(PythonLibs)
diff --git a/debian/patches/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index 0e43d7d..c7866f2 100644
--- a/debian/patches/20_skip_license_file.patch
+++ b/debian/patches/20_skip_license_file.patch
@@ -2,11 +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
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -1498,7 +1498,7 @@ if(UNIX)
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -1551,7 +1551,7 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@ Index: gmsh-2.10.1-source_repack/CMakeLists.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/?*.*)
-@@ -1665,7 +1665,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1718,7 +1718,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/30_delete_gl2ps_from_source.patch b/debian/patches/30_delete_gl2ps_from_source.patch
index f855c8c..4301e94 100644
--- a/debian/patches/30_delete_gl2ps_from_source.patch
+++ b/debian/patches/30_delete_gl2ps_from_source.patch
@@ -2,10 +2,10 @@ 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
-Index: gmsh-2.10.1-source_repack/Graphics/CMakeLists.txt
+Index: gmsh-2.11.0-source/Graphics/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/Graphics/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/Graphics/CMakeLists.txt
+--- gmsh-2.11.0-source.orig/Graphics/CMakeLists.txt
++++ gmsh-2.11.0-source/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +14,11 @@ Index: gmsh-2.10.1-source_repack/Graphics/CMakeLists.txt
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -1447,7 +1447,7 @@ else(HAVE_FLTK)
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -1499,7 +1499,7 @@ else(HAVE_FLTK)
add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
endif(ENABLE_BUILD_DYNAMIC)
endif(HAVE_FLTK)
diff --git a/debian/patches/40_switch_from_opencascade_to_oce.patch b/debian/patches/40_switch_from_opencascade_to_oce.patch
index 785a4d1..b548258 100644
--- a/debian/patches/40_switch_from_opencascade_to_oce.patch
+++ b/debian/patches/40_switch_from_opencascade_to_oce.patch
@@ -4,11 +4,11 @@ Author: D. Barbier <bouzim at gmail.com>
Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-02-10
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -1067,15 +1067,6 @@ if(HAVE_SOLVER)
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -1079,15 +1079,6 @@ if(HAVE_SOLVER)
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -24,7 +24,7 @@ Index: gmsh-2.10.1-source_repack/CMakeLists.txt
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -1087,6 +1078,30 @@ if(ENABLE_OCC)
+@@ -1099,6 +1090,30 @@ if(ENABLE_OCC)
# FoundationClasses
# TKAdvTools -- not necessary? (and removed from OCC 6.8)
TKMath TKernel)
@@ -55,7 +55,7 @@ Index: gmsh-2.10.1-source_repack/CMakeLists.txt
if(ENABLE_SGEOM)
set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
# For SGEOM
-@@ -1131,6 +1146,7 @@ if(ENABLE_OCC)
+@@ -1143,6 +1158,7 @@ if(ENABLE_OCC)
endif(NOT OCC_CONFIG_H)
endif(OCC_INC)
endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
diff --git a/debian/patches/60_fix_gmshpy_import.patch b/debian/patches/60_fix_gmshpy_import.patch
index 15f789c..26dd52f 100644
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ b/debian/patches/60_fix_gmshpy_import.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: http://bugs.debian.org/696420
Last-Update: 2014-02-06
-Index: gmsh-2.10.1-source_repack/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.11.0-source/wrappers/gmshpy/__init__.py.in
===================================================================
---- gmsh-2.10.1-source_repack.orig/wrappers/gmshpy/__init__.py.in
-+++ gmsh-2.10.1-source_repack/wrappers/gmshpy/__init__.py.in
+--- gmsh-2.11.0-source.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.11.0-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/70_fix_libdir.patch b/debian/patches/70_fix_libdir.patch
index a1b57be..e30afd6 100644
--- a/debian/patches/70_fix_libdir.patch
+++ b/debian/patches/70_fix_libdir.patch
@@ -2,10 +2,10 @@ Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
+Index: gmsh-2.11.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
+--- gmsh-2.11.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.11.0-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
@@ -15,11 +15,11 @@ Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-2.10.1-source_repack/CMakeLists.txt
+Index: gmsh-2.11.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/CMakeLists.txt
-@@ -1581,7 +1581,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-2.11.0-source.orig/CMakeLists.txt
++++ gmsh-2.11.0-source/CMakeLists.txt
+@@ -1634,7 +1634,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 @@ Index: gmsh-2.10.1-source_repack/CMakeLists.txt
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1617,7 +1617,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1670,7 +1670,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/80_fix_script_header.patch b/debian/patches/80_fix_script_header.patch
index d33ab6a..c11f2a1 100644
--- a/debian/patches/80_fix_script_header.patch
+++ b/debian/patches/80_fix_script_header.patch
@@ -2,10 +2,10 @@ Description: add header into onelab
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
-Index: gmsh-2.10.1-source_repack/contrib/onelab/python/onelab.py
+Index: gmsh-2.11.0-source/contrib/onelab/python/onelab.py
===================================================================
---- gmsh-2.10.1-source_repack.orig/contrib/onelab/python/onelab.py
-+++ gmsh-2.10.1-source_repack/contrib/onelab/python/onelab.py
+--- gmsh-2.11.0-source.orig/contrib/onelab/python/onelab.py
++++ gmsh-2.11.0-source/contrib/onelab/python/onelab.py
@@ -27,6 +27,8 @@ Please report all bugs and problems to t
<gmsh at geuz.org>.
"""
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index 236c719..54e0930 100644
--- a/debian/patches/90_fix_java_wrapper_compilation.patch
+++ b/debian/patches/90_fix_java_wrapper_compilation.patch
@@ -2,10 +2,10 @@ Description: <short summary of the patch>
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-07-24
-Index: gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
+Index: gmsh-2.11.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.10.1-source_repack.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.10.1-source_repack/wrappers/java/CMakeLists.txt
+--- gmsh-2.11.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.11.0-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})
--
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