[gmsh] 04/10: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Mon Mar 21 23:30:10 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 8811d12a36e3f0199032cd7886bd9f8713a16e40
Author: Anton Gladky <gladk at debian.org>
Date: Mon Mar 21 22:23:22 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/130_gcc6_fix.patch | 6 +++---
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 | 8 ++++----
debian/patches/90_fix_java_wrapper_compilation.patch | 6 +++---
debian/patches/series | 2 ++
13 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/debian/patches/100_enable_tetgen.patch b/debian/patches/100_enable_tetgen.patch
index 4cd2548..e212bce 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.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -830,6 +830,7 @@ if(HAVE_MESH)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -807,6 +807,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.11.0-source/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)
-@@ -1515,7 +1516,7 @@ else(HAVE_FLTK)
+@@ -1519,7 +1520,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 dcf3118..aab59ac 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.11.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.11.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.12.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.12.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.11.0-source/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.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -1438,7 +1438,7 @@ endforeach(DIR)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -1442,7 +1442,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@ Index: gmsh-2.11.0-source/CMakeLists.txt
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1465,10 +1465,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1469,10 +1469,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 664147b..a3d63cf 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.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -849,8 +849,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -826,8 +826,10 @@ if(ENABLE_FOURIER_MODEL)
endif(ENABLE_FOURIER_MODEL)
if(ENABLE_MED OR ENABLE_CGNS)
@@ -16,7 +16,7 @@ Index: gmsh-2.11.0-source/CMakeLists.txt
if(ENABLE_MED)
find_library(MED_LIB med)
if(MED_LIB)
-@@ -881,9 +883,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -858,9 +860,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 ff5453a..72b761f 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.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -1215,7 +1215,7 @@ endif(ENABLE_ZIPPER)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -1205,7 +1205,7 @@ endif(ENABLE_ZIPPER)
if(ENABLE_WRAP_PYTHON)
find_package(SWIG)
find_package(PythonLibs)
diff --git a/debian/patches/130_gcc6_fix.patch b/debian/patches/130_gcc6_fix.patch
index f673103..b26e375 100644
--- a/debian/patches/130_gcc6_fix.patch
+++ b/debian/patches/130_gcc6_fix.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
Bug-Debian: https://bugs.debian.org/811792
Last-Update: 2016-01-30
-Index: gmsh-2.11.0+dfsg1/Fltk/FlGui.cpp
+Index: gmsh-2.12.0-source/Fltk/FlGui.cpp
===================================================================
---- gmsh-2.11.0+dfsg1.orig/Fltk/FlGui.cpp
-+++ gmsh-2.11.0+dfsg1/Fltk/FlGui.cpp
+--- gmsh-2.12.0-source.orig/Fltk/FlGui.cpp
++++ gmsh-2.12.0-source/Fltk/FlGui.cpp
@@ -370,7 +370,7 @@ FlGui::FlGui(int argc, char **argv)
// nothing to do here
#else
diff --git a/debian/patches/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index c7866f2..77cf6a0 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.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -1551,7 +1551,7 @@ if(UNIX)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -1555,7 +1555,7 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@ Index: gmsh-2.11.0-source/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/?*.*)
-@@ -1718,7 +1718,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1722,7 +1722,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 4301e94..b3fec5e 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.11.0-source/Graphics/CMakeLists.txt
+Index: gmsh-2.12.0-source/Graphics/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/Graphics/CMakeLists.txt
-+++ gmsh-2.11.0-source/Graphics/CMakeLists.txt
+--- gmsh-2.12.0-source.orig/Graphics/CMakeLists.txt
++++ gmsh-2.12.0-source/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +14,11 @@ Index: gmsh-2.11.0-source/Graphics/CMakeLists.txt
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-2.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -1499,7 +1499,7 @@ else(HAVE_FLTK)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -1503,7 +1503,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 b548258..cb63464 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.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -1079,15 +1079,6 @@ if(HAVE_SOLVER)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -1069,15 +1069,6 @@ if(HAVE_SOLVER)
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -24,7 +24,7 @@ Index: gmsh-2.11.0-source/CMakeLists.txt
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -1099,6 +1090,30 @@ if(ENABLE_OCC)
+@@ -1089,6 +1080,30 @@ if(ENABLE_OCC)
# FoundationClasses
# TKAdvTools -- not necessary? (and removed from OCC 6.8)
TKMath TKernel)
@@ -55,7 +55,7 @@ Index: gmsh-2.11.0-source/CMakeLists.txt
if(ENABLE_SGEOM)
set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
# For SGEOM
-@@ -1143,6 +1158,7 @@ if(ENABLE_OCC)
+@@ -1133,6 +1148,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 26dd52f..74ec205 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.11.0-source/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.12.0-source/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
+--- gmsh-2.12.0-source.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.12.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 e30afd6..d76e605 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.11.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.11.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.12.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.12.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.11.0-source/wrappers/java/CMakeLists.txt
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-2.11.0-source/CMakeLists.txt
+Index: gmsh-2.12.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/CMakeLists.txt
-+++ gmsh-2.11.0-source/CMakeLists.txt
-@@ -1634,7 +1634,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-2.12.0-source.orig/CMakeLists.txt
++++ gmsh-2.12.0-source/CMakeLists.txt
+@@ -1638,7 +1638,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.11.0-source/CMakeLists.txt
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1670,7 +1670,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1674,7 +1674,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 c11f2a1..1d31b2c 100644
--- a/debian/patches/80_fix_script_header.patch
+++ b/debian/patches/80_fix_script_header.patch
@@ -2,12 +2,12 @@ Description: add header into onelab
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
-Index: gmsh-2.11.0-source/contrib/onelab/python/onelab.py
+Index: gmsh-2.12.0-source/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
+--- gmsh-2.12.0-source.orig/contrib/onelab/python/onelab.py
++++ gmsh-2.12.0-source/contrib/onelab/python/onelab.py
@@ -27,6 +27,8 @@ Please report all bugs and problems to t
- <gmsh at geuz.org>.
+ <gmsh at onelab.info>.
"""
+#!/usr/bin/env python
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index 54e0930..58dbb23 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.11.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.11.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.11.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.12.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.12.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})
diff --git a/debian/patches/series b/debian/patches/series
index 0769bce..fcf6953 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,5 @@
110_fix_cmake_hdf5.patch
120_relax_python_vers.patch
130_gcc6_fix.patch
+140_fix_java.patch
+150_fix_texifile.patch
--
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