[gmsh] 01/06: Refresh patches
Anton Gladky
gladk at moszumanska.debian.org
Wed Oct 18 19:42:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 8f2376f3e0a4d0f493a892cb613598126d12844a
Author: Anton Gladky <gladk at debian.org>
Date: Wed Oct 18 21:02:00 2017 +0200
Refresh patches
---
debian/patches/10_change_shared_library_name.patch | 18 +++++++++---------
debian/patches/110_fix_cmake_hdf5.patch | 10 +++++-----
debian/patches/20_skip_license_file.patch | 14 +++++++-------
debian/patches/30_delete_gl2ps_from_source.patch | 18 +++++++++---------
debian/patches/60_fix_gmshpy_import.patch | 6 +++---
debian/patches/70_fix_libdir.patch | 18 +++++++++---------
debian/patches/80_fix_script_header.patch | 8 ++++----
debian/patches/90_fix_java_wrapper_compilation.patch | 8 ++++----
debian/patches/series | 1 +
9 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index dab09fa..8cb74ed 100644
--- a/debian/patches/10_change_shared_library_name.patch
+++ b/debian/patches/10_change_shared_library_name.patch
@@ -2,11 +2,11 @@ Description: Change name of shared library
Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2012-11-28
-Index: gmsh/wrappers/java/CMakeLists.txt
+Index: gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh.orig/wrappers/java/CMakeLists.txt 2017-09-22 18:28:22.229355775 +0200
-+++ gmsh/wrappers/java/CMakeLists.txt 2017-09-22 18:28:22.225355749 +0200
-@@ -34,7 +34,11 @@
+--- gmsh-3.0.5-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
+@@ -34,7 +34,11 @@ if(WIN32)
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
if(UNIX)
@@ -19,11 +19,11 @@ Index: gmsh/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/CMakeLists.txt
+Index: gmsh-3.0.5-source/CMakeLists.txt
===================================================================
---- gmsh.orig/CMakeLists.txt 2017-09-22 18:28:22.229355775 +0200
-+++ gmsh/CMakeLists.txt 2017-09-22 18:28:22.225355749 +0200
-@@ -1460,7 +1460,7 @@
+--- gmsh-3.0.5-source.orig/CMakeLists.txt
++++ gmsh-3.0.5-source/CMakeLists.txt
+@@ -1460,7 +1460,7 @@ endforeach(DIR)
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@ Index: gmsh/CMakeLists.txt
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1492,10 +1492,10 @@
+@@ -1492,10 +1492,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 35bf0fc..9409e1d 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/CMakeLists.txt
+Index: gmsh-3.0.5-source/CMakeLists.txt
===================================================================
---- gmsh.orig/CMakeLists.txt 2017-09-22 18:28:23.233362234 +0200
-+++ gmsh/CMakeLists.txt 2017-09-22 18:28:23.229362209 +0200
-@@ -841,8 +841,10 @@
+--- gmsh-3.0.5-source.orig/CMakeLists.txt
++++ gmsh-3.0.5-source/CMakeLists.txt
+@@ -841,8 +841,10 @@ if(ENABLE_FOURIER_MODEL)
endif(ENABLE_FOURIER_MODEL)
if(ENABLE_MED OR ENABLE_CGNS)
@@ -16,7 +16,7 @@ Index: gmsh/CMakeLists.txt
if(ENABLE_MED)
find_library(MED_LIB med)
if(MED_LIB)
-@@ -873,9 +875,9 @@
+@@ -873,9 +875,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/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index 3b41787..1654e32 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>, Nico Schlömer <nico.schloemer at gmail.com>
Last-Update: 2017-09-22
-Index: gmsh/CMakeLists.txt
+Index: gmsh-3.0.5-source/CMakeLists.txt
===================================================================
---- gmsh.orig/CMakeLists.txt 2017-09-22 18:28:22.381356752 +0200
-+++ gmsh/CMakeLists.txt 2017-09-22 18:28:22.377356727 +0200
-@@ -1578,7 +1578,6 @@
+--- gmsh-3.0.5-source.orig/CMakeLists.txt
++++ gmsh-3.0.5-source/CMakeLists.txt
+@@ -1578,7 +1578,6 @@ if(UNIX)
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -14,7 +14,7 @@ Index: gmsh/CMakeLists.txt
set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CREDITS.txt)
set(CHANGELOG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.txt)
set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
-@@ -1628,7 +1627,6 @@
+@@ -1628,7 +1627,6 @@ if(WIN32 OR CYGWIN)
if(CYGWIN)
unix2dos(GMSH_API)
unix2dos(WELCOME_FILE)
@@ -22,7 +22,7 @@ Index: gmsh/CMakeLists.txt
unix2dos(CREDITS_FILE)
unix2dos(CHANGELOG_FILE)
unix2dos(TUTORIAL_FILES)
-@@ -1702,7 +1700,6 @@
+@@ -1702,7 +1700,6 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHAR
install(FILES ${GMSH_API} DESTINATION include/gmsh)
endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
@@ -30,7 +30,7 @@ Index: gmsh/CMakeLists.txt
install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC})
install(FILES ${CHANGELOG_FILE} DESTINATION ${GMSH_DOC})
install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial)
-@@ -1804,7 +1801,6 @@
+@@ -1804,7 +1801,6 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"3D finite element mesh generator with built-in CAD engine and post-processor")
set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Gmsh")
diff --git a/debian/patches/30_delete_gl2ps_from_source.patch b/debian/patches/30_delete_gl2ps_from_source.patch
index 53c3994..bc85134 100644
--- a/debian/patches/30_delete_gl2ps_from_source.patch
+++ b/debian/patches/30_delete_gl2ps_from_source.patch
@@ -2,11 +2,11 @@ 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/Graphics/CMakeLists.txt
+Index: gmsh-3.0.5-source/Graphics/CMakeLists.txt
===================================================================
---- gmsh.orig/Graphics/CMakeLists.txt 2017-09-22 18:28:22.513357601 +0200
-+++ gmsh/Graphics/CMakeLists.txt 2017-09-22 18:28:22.509357576 +0200
-@@ -15,7 +15,6 @@
+--- gmsh-3.0.5-source.orig/Graphics/CMakeLists.txt
++++ gmsh-3.0.5-source/Graphics/CMakeLists.txt
+@@ -15,7 +15,6 @@ set(SRC
drawScales.cpp
drawGraph2d.cpp
drawGlyph.cpp
@@ -14,11 +14,11 @@ Index: gmsh/Graphics/CMakeLists.txt
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh/CMakeLists.txt
+Index: gmsh-3.0.5-source/CMakeLists.txt
===================================================================
---- gmsh.orig/CMakeLists.txt 2017-09-22 18:28:22.513357601 +0200
-+++ gmsh/CMakeLists.txt 2017-09-22 18:28:22.509357576 +0200
-@@ -821,6 +821,7 @@
+--- gmsh-3.0.5-source.orig/CMakeLists.txt
++++ gmsh-3.0.5-source/CMakeLists.txt
+@@ -821,6 +821,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/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)
-@@ -1416,6 +1417,8 @@
+@@ -1416,6 +1417,8 @@ else(HAVE_FLTK)
set(LINK_LIBRARIES ${EXTERNAL_LIBRARIES} ${LAPACK_LIBRARIES})
endif(HAVE_FLTK)
diff --git a/debian/patches/60_fix_gmshpy_import.patch b/debian/patches/60_fix_gmshpy_import.patch
index 91a34d6..6eca0b6 100644
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ b/debian/patches/60_fix_gmshpy_import.patch
@@ -2,10 +2,10 @@ Description: Fix import of gmshpy
Bug-Debian: https://bugs.debian.org/696420
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2014-02-06
-Index: gmsh/wrappers/gmshpy/__init__.py.in
+Index: gmsh-3.0.5-source/wrappers/gmshpy/__init__.py.in
===================================================================
---- gmsh.orig/wrappers/gmshpy/__init__.py.in 2017-09-22 18:28:22.649358477 +0200
-+++ gmsh/wrappers/gmshpy/__init__.py.in 2017-09-22 18:28:22.649358477 +0200
+--- gmsh-3.0.5-source.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-3.0.5-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 6d80b64..8bc4e83 100644
--- a/debian/patches/70_fix_libdir.patch
+++ b/debian/patches/70_fix_libdir.patch
@@ -2,11 +2,11 @@ Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-03-15
-Index: gmsh/wrappers/java/CMakeLists.txt
+Index: gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh.orig/wrappers/java/CMakeLists.txt 2017-09-22 18:28:22.789359377 +0200
-+++ gmsh/wrappers/java/CMakeLists.txt 2017-09-22 18:28:22.785359352 +0200
-@@ -73,6 +73,6 @@
+--- gmsh-3.0.5-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-3.0.5-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
${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
@@ -15,11 +15,11 @@ Index: gmsh/wrappers/java/CMakeLists.txt
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh/CMakeLists.txt
+Index: gmsh-3.0.5-source/CMakeLists.txt
===================================================================
---- gmsh.orig/CMakeLists.txt 2017-09-22 18:28:22.789359377 +0200
-+++ gmsh/CMakeLists.txt 2017-09-22 18:28:22.785359352 +0200
-@@ -1656,7 +1656,7 @@
+--- gmsh-3.0.5-source.orig/CMakeLists.txt
++++ gmsh-3.0.5-source/CMakeLists.txt
+@@ -1656,7 +1656,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/CMakeLists.txt
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1692,7 +1692,7 @@
+@@ -1692,7 +1692,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 a52d423..91a939c 100644
--- a/debian/patches/80_fix_script_header.patch
+++ b/debian/patches/80_fix_script_header.patch
@@ -2,11 +2,11 @@ Description: add header into onelab
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-05-12
-Index: gmsh/contrib/onelab/python/onelab.py
+Index: gmsh-3.0.5-source/contrib/onelab/python/onelab.py
===================================================================
---- gmsh.orig/contrib/onelab/python/onelab.py 2017-09-22 18:28:22.937360330 +0200
-+++ gmsh/contrib/onelab/python/onelab.py 2017-09-22 18:28:22.937360330 +0200
-@@ -27,6 +27,8 @@
+--- gmsh-3.0.5-source.orig/contrib/onelab/python/onelab.py
++++ gmsh-3.0.5-source/contrib/onelab/python/onelab.py
+@@ -27,6 +27,8 @@ Please report all bugs and problems to t
<gmsh at onelab.info>.
"""
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index e35271d..15c7e26 100644
--- a/debian/patches/90_fix_java_wrapper_compilation.patch
+++ b/debian/patches/90_fix_java_wrapper_compilation.patch
@@ -2,11 +2,11 @@ Description: <short summary of the patch>
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2013-07-24
-Index: gmsh/wrappers/java/CMakeLists.txt
+Index: gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh.orig/wrappers/java/CMakeLists.txt 2017-09-22 18:28:23.093361333 +0200
-+++ gmsh/wrappers/java/CMakeLists.txt 2017-09-22 18:28:23.089361308 +0200
-@@ -13,7 +13,7 @@
+--- gmsh-3.0.5-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-3.0.5-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})
# define where the interface file (used by SWIG) are
diff --git a/debian/patches/series b/debian/patches/series
index 0b2a5f6..4548e43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
90_fix_java_wrapper_compilation.patch
110_fix_cmake_hdf5.patch
# 120_relax_python_vers.patch # fixed upstream
+120_Java_Fix.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