[gmsh] 03/04: refresh patches
Nico Schlömer
nschloe-guest at moszumanska.debian.org
Fri Sep 22 16:30:34 UTC 2017
This is an automated email from the git hooks/post-receive script.
nschloe-guest pushed a commit to branch master
in repository gmsh.
commit 5c9ff4de3ec353e37897c39e49aa4906daec286e
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date: Fri Sep 22 18:29:34 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 | 16 ++++++++--------
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 | 2 +-
9 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index 2905bb6..dab09fa 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-2.15.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.15.0-source/wrappers/java/CMakeLists.txt
-@@ -34,7 +34,11 @@ if(WIN32)
+--- 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 @@
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
if(UNIX)
@@ -19,11 +19,11 @@ Index: gmsh-2.15.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.15.0-source/CMakeLists.txt
+Index: gmsh/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/CMakeLists.txt
-+++ gmsh-2.15.0-source/CMakeLists.txt
-@@ -1458,7 +1458,7 @@ endforeach(DIR)
+--- 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 @@
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@ Index: gmsh-2.15.0-source/CMakeLists.txt
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1485,10 +1485,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1492,10 +1492,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/110_fix_cmake_hdf5.patch b/debian/patches/110_fix_cmake_hdf5.patch
index 7192268..35bf0fc 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.15.0-source/CMakeLists.txt
+Index: gmsh/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/CMakeLists.txt
-+++ gmsh-2.15.0-source/CMakeLists.txt
-@@ -839,8 +839,10 @@ if(ENABLE_FOURIER_MODEL)
+--- 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 @@
endif(ENABLE_FOURIER_MODEL)
if(ENABLE_MED OR ENABLE_CGNS)
@@ -16,7 +16,7 @@ Index: gmsh-2.15.0-source/CMakeLists.txt
if(ENABLE_MED)
find_library(MED_LIB med)
if(MED_LIB)
-@@ -871,9 +873,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -873,9 +875,9 @@
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 94ec609..3b41787 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
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b71bb6e5..bc804023 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1578,7 +1578,6 @@ if(UNIX)
+Index: gmsh/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 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -14,7 +14,7 @@ index b71bb6e5..bc804023 100644
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 @@ if(WIN32 OR CYGWIN)
+@@ -1628,7 +1627,6 @@
if(CYGWIN)
unix2dos(GMSH_API)
unix2dos(WELCOME_FILE)
@@ -22,7 +22,7 @@ index b71bb6e5..bc804023 100644
unix2dos(CREDITS_FILE)
unix2dos(CHANGELOG_FILE)
unix2dos(TUTORIAL_FILES)
-@@ -1702,7 +1700,6 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+@@ -1702,7 +1700,6 @@
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 b71bb6e5..bc804023 100644
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 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+@@ -1804,7 +1801,6 @@
"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 2aef35f..53c3994 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-2.15.0-source/Graphics/CMakeLists.txt
+Index: gmsh/Graphics/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/Graphics/CMakeLists.txt
-+++ gmsh-2.15.0-source/Graphics/CMakeLists.txt
-@@ -15,7 +15,6 @@ set(SRC
+--- 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 @@
drawScales.cpp
drawGraph2d.cpp
drawGlyph.cpp
@@ -14,11 +14,11 @@ Index: gmsh-2.15.0-source/Graphics/CMakeLists.txt
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-2.15.0-source/CMakeLists.txt
+Index: gmsh/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/CMakeLists.txt
-+++ gmsh-2.15.0-source/CMakeLists.txt
-@@ -819,6 +819,7 @@ if(HAVE_MESH)
+--- 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 @@
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.15.0-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)
-@@ -1414,6 +1415,8 @@ else(HAVE_FLTK)
+@@ -1416,6 +1417,8 @@
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 a361777..91a34d6 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-2.15.0-source/wrappers/gmshpy/__init__.py.in
+Index: gmsh/wrappers/gmshpy/__init__.py.in
===================================================================
---- gmsh-2.15.0-source.orig/wrappers/gmshpy/__init__.py.in
-+++ gmsh-2.15.0-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
@@ -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 a88b9a4..6d80b64 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-2.15.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.15.0-source/wrappers/java/CMakeLists.txt
-@@ -73,6 +73,6 @@ POST_BUILD # do the rest of the command
+--- 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 @@
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml
${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/)
@@ -15,11 +15,11 @@ Index: gmsh-2.15.0-source/wrappers/java/CMakeLists.txt
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar
- DESTINATION lib)
+ DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-2.15.0-source/CMakeLists.txt
+Index: gmsh/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/CMakeLists.txt
-+++ gmsh-2.15.0-source/CMakeLists.txt
-@@ -1657,7 +1657,7 @@ endif(WIN32 OR CYGWIN)
+--- 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 @@
# (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.15.0-source/CMakeLists.txt
endif(ENABLE_BUILD_LIB)
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1693,7 +1693,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1692,7 +1692,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/80_fix_script_header.patch b/debian/patches/80_fix_script_header.patch
index 9a1326c..a52d423 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-2.15.0-source/contrib/onelab/python/onelab.py
+Index: gmsh/contrib/onelab/python/onelab.py
===================================================================
---- gmsh-2.15.0-source.orig/contrib/onelab/python/onelab.py
-+++ gmsh-2.15.0-source/contrib/onelab/python/onelab.py
-@@ -27,6 +27,8 @@ Please report all bugs and problems to t
+--- 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 at onelab.info>.
"""
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index b261cf9..e35271d 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-2.15.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh/wrappers/java/CMakeLists.txt
===================================================================
---- gmsh-2.15.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.15.0-source/wrappers/java/CMakeLists.txt
-@@ -13,7 +13,7 @@ include_directories(${JAVA_INCLUDE_PATH}
+--- 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 @@
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 e4b3442..0b2a5f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,4 @@
80_fix_script_header.patch
90_fix_java_wrapper_compilation.patch
110_fix_cmake_hdf5.patch
-120_relax_python_vers.patch
+# 120_relax_python_vers.patch # fixed upstream
--
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