[gmsh] 02/04: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Thu Oct 20 20:52:59 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 9e643757927f6a76742ce2195abaea79a33d6839
Author: Anton Gladky <gladk at debian.org>
Date: Thu Oct 20 22:44:43 2016 +0200
Refresh patches.
---
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 | 16 ++++++++--------
debian/patches/40_switch_from_opencascade_to_oce.patch | 12 ++++++------
debian/patches/60_fix_gmshpy_import.patch | 9 ++++-----
debian/patches/70_fix_libdir.patch | 16 ++++++++--------
debian/patches/80_fix_script_header.patch | 8 ++++----
debian/patches/90_fix_java_wrapper_compilation.patch | 6 +++---
10 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index 6443d96..f6e55e9 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.13.2-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.13.2-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.14.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.14.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.13.2-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.13.2-source/CMakeLists.txt
+Index: gmsh-2.14.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/CMakeLists.txt
-+++ gmsh-2.13.2-source/CMakeLists.txt
-@@ -1459,7 +1459,7 @@ endforeach(DIR)
+--- gmsh-2.14.0-source.orig/CMakeLists.txt
++++ gmsh-2.14.0-source/CMakeLists.txt
+@@ -1453,7 +1453,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@ Index: gmsh-2.13.2-source/CMakeLists.txt
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1486,10 +1486,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1480,10 +1480,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 bc8351a..d3318ea 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.13.2-source/CMakeLists.txt
+Index: gmsh-2.14.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/CMakeLists.txt
-+++ gmsh-2.13.2-source/CMakeLists.txt
-@@ -828,8 +828,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-2.14.0-source.orig/CMakeLists.txt
++++ gmsh-2.14.0-source/CMakeLists.txt
+@@ -839,8 +839,10 @@ if(ENABLE_FOURIER_MODEL)
endif(ENABLE_FOURIER_MODEL)
if(ENABLE_MED OR ENABLE_CGNS)
@@ -16,7 +16,7 @@ Index: gmsh-2.13.2-source/CMakeLists.txt
if(ENABLE_MED)
find_library(MED_LIB med)
if(MED_LIB)
-@@ -860,9 +862,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -871,9 +873,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 ccdd481..3c43a00 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.13.2-source/CMakeLists.txt
+Index: gmsh-2.14.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/CMakeLists.txt
-+++ gmsh-2.13.2-source/CMakeLists.txt
-@@ -1217,7 +1217,7 @@ endif(ENABLE_ZIPPER)
+--- gmsh-2.14.0-source.orig/CMakeLists.txt
++++ gmsh-2.14.0-source/CMakeLists.txt
+@@ -1228,7 +1228,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 c0f8a5a..6dda8fa 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.13.2-source/CMakeLists.txt
+Index: gmsh-2.14.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/CMakeLists.txt
-+++ gmsh-2.13.2-source/CMakeLists.txt
-@@ -1572,7 +1572,7 @@ if(UNIX)
+--- gmsh-2.14.0-source.orig/CMakeLists.txt
++++ gmsh-2.14.0-source/CMakeLists.txt
+@@ -1566,7 +1566,7 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@ Index: gmsh-2.13.2-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/?*.*)
-@@ -1739,7 +1739,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1733,7 +1733,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 6bee2ed..08c9be5 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. Use also packaged tetgen.
Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
Last-Update: 2012-11-28
-Index: gmsh-2.13.2-source/Graphics/CMakeLists.txt
+Index: gmsh-2.14.0-source/Graphics/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/Graphics/CMakeLists.txt
-+++ gmsh-2.13.2-source/Graphics/CMakeLists.txt
+--- gmsh-2.14.0-source.orig/Graphics/CMakeLists.txt
++++ gmsh-2.14.0-source/Graphics/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
@@ -14,11 +14,11 @@ Index: gmsh-2.13.2-source/Graphics/CMakeLists.txt
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-2.13.2-source/CMakeLists.txt
+Index: gmsh-2.14.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/CMakeLists.txt
-+++ gmsh-2.13.2-source/CMakeLists.txt
-@@ -808,6 +808,7 @@ if(HAVE_MESH)
+--- gmsh-2.14.0-source.orig/CMakeLists.txt
++++ gmsh-2.14.0-source/CMakeLists.txt
+@@ -819,6 +819,7 @@ if(HAVE_MESH)
if(TETGEN_LIB AND TETGEN_INC)
list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
@@ -26,7 +26,7 @@ Index: gmsh-2.13.2-source/CMakeLists.txt
set_config_option(HAVE_TETGEN "Tetgen")
endif(TETGEN_LIB AND TETGEN_INC)
endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
-@@ -1415,6 +1416,8 @@ else(HAVE_FLTK)
+@@ -1409,6 +1410,8 @@ else(HAVE_FLTK)
set(LINK_LIBRARIES ${EXTERNAL_LIBRARIES} ${LAPACK_LIBRARIES})
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 528bc2a..049b5f5 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.13.2-source/CMakeLists.txt
+Index: gmsh-2.14.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/CMakeLists.txt
-+++ gmsh-2.13.2-source/CMakeLists.txt
-@@ -1082,15 +1082,6 @@ if(HAVE_SOLVER)
+--- gmsh-2.14.0-source.orig/CMakeLists.txt
++++ gmsh-2.14.0-source/CMakeLists.txt
+@@ -1093,15 +1093,6 @@ if(HAVE_SOLVER)
endif(HAVE_SOLVER)
if(ENABLE_OCC)
@@ -24,7 +24,7 @@ Index: gmsh-2.13.2-source/CMakeLists.txt
set(OCC_LIBS_REQUIRED
# subset of DataExchange
TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -1102,6 +1093,30 @@ if(ENABLE_OCC)
+@@ -1113,6 +1104,30 @@ if(ENABLE_OCC)
# FoundationClasses
# TKAdvTools -- not necessary? (and removed from OCC 6.8)
TKMath TKernel)
@@ -55,7 +55,7 @@ Index: gmsh-2.13.2-source/CMakeLists.txt
if(ENABLE_SGEOM)
set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
# For SGEOM
-@@ -1146,6 +1161,7 @@ if(ENABLE_OCC)
+@@ -1157,6 +1172,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 324bd56..80a1bb3 100644
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ b/debian/patches/60_fix_gmshpy_import.patch
@@ -1,12 +1,11 @@
Description: Fix import of gmshpy
+Bug-Debian: https://bugs.debian.org/696420
Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: http://bugs.debian.org/696420
Last-Update: 2014-02-06
-
-Index: gmsh-2.13.2-source/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.14.0-source/wrappers/gmshpy/__init__.py.in
===================================================================
---- gmsh-2.13.2-source.orig/wrappers/gmshpy/__init__.py.in
-+++ gmsh-2.13.2-source/wrappers/gmshpy/__init__.py.in
+--- gmsh-2.14.0-source.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.14.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 0199365..ff23588 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.13.2-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.13.2-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.14.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.14.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.13.2-source/wrappers/java/CMakeLists.txt
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-2.13.2-source/CMakeLists.txt
+Index: gmsh-2.14.0-source/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/CMakeLists.txt
-+++ gmsh-2.13.2-source/CMakeLists.txt
-@@ -1658,7 +1658,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-2.14.0-source.orig/CMakeLists.txt
++++ gmsh-2.14.0-source/CMakeLists.txt
+@@ -1652,7 +1652,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.13.2-source/CMakeLists.txt
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1694,7 +1694,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1688,7 +1688,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 af74cdb..ba374d1 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.13.2-source/contrib/onelab/python/onelab.py
+Index: gmsh-2.14.0-source/contrib/onelab/python/onelab.py
===================================================================
---- gmsh-2.13.2-source.orig/contrib/onelab/python/onelab.py
-+++ gmsh-2.13.2-source/contrib/onelab/python/onelab.py
+--- gmsh-2.14.0-source.orig/contrib/onelab/python/onelab.py
++++ gmsh-2.14.0-source/contrib/onelab/python/onelab.py
@@ -27,6 +27,8 @@ Please report all bugs and problems to t
<gmsh at onelab.info>.
"""
@@ -13,5 +13,5 @@ Index: gmsh-2.13.2-source/contrib/onelab/python/onelab.py
+#!/usr/bin/env python
+
import socket, struct, os, sys, subprocess, time
- _VERSION = '1.2'
+ _VERSION = '1.3'
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index fe6911b..ee3b192 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.13.2-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.14.0-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.13.2-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.13.2-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.14.0-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.14.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