[gmsh] 04/04: refresh patches
Nico Schlömer
nschloe-guest at moszumanska.debian.org
Mon Nov 6 15:27:58 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 03a334b5cb5e84b762ab2fdda95944d75f4024b4
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date: Mon Nov 6 16:26:59 2017 +0100
refresh patches
---
debian/patches/10_change_shared_library_name.patch | 24 ++++++++++++----------
debian/patches/140_drop_css.patch | 8 +++++---
debian/patches/20_skip_license_file.patch | 18 ++++++++--------
debian/patches/30_delete_gl2ps_from_source.patch | 18 ++++++++--------
4 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index dd083c7..5e45690 100644
--- a/debian/patches/10_change_shared_library_name.patch
+++ b/debian/patches/10_change_shared_library_name.patch
@@ -3,9 +3,11 @@ Author: Anton Gladky <gladky.anton at gmail.com>
Last-Update: 2017-11-06
index 10690371..3d026607 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1501,7 +1501,7 @@ endforeach(DIR)
+Index: gmsh/CMakeLists.txt
+===================================================================
+--- gmsh.orig/CMakeLists.txt 2017-11-06 16:25:33.351228762 +0100
++++ gmsh/CMakeLists.txt 2017-11-06 16:25:33.351228762 +0100
+@@ -1501,7 +1501,7 @@
# static library target
if(ENABLE_BUILD_LIB)
add_library(lib STATIC ${GMSH_SRC})
@@ -14,7 +16,7 @@ index 10690371..3d026607 100644
if(MSVC)
set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1523,7 +1523,7 @@ if(ENABLE_BUILD_ANDROID)
+@@ -1523,7 +1523,7 @@
add_definitions(-DBUILD_ANDROID)
add_definitions(-DPICOJSON_USE_LOCALE=0)
add_library(androidGmsh SHARED ${GMSH_SRC})
@@ -23,7 +25,7 @@ index 10690371..3d026607 100644
target_link_libraries(androidGmsh ${EXTERNAL_LIBRARIES} ${LAPACK_LIBRARIES})
add_custom_command(TARGET androidGmsh POST_BUILD COMMAND
${CMAKE_STRIP} ${LIBRARY_OUTPUT_PATH}/libGmsh.so)
-@@ -1533,10 +1533,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1533,10 +1533,10 @@
if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
add_library(shared SHARED ${GMSH_SRC})
@@ -36,7 +38,7 @@ index 10690371..3d026607 100644
if(HAVE_LAPACK AND LAPACK_FLAGS)
set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
endif(HAVE_LAPACK AND LAPACK_FLAGS)
-@@ -1848,7 +1848,7 @@ if(GMSH_EXTRA_VERSION MATCHES "-git.*") # so that we'll overwrite the archives
+@@ -1848,7 +1848,7 @@
set(CPACK_PACKAGE_FILE_NAME gmsh-git-${GMSH_OS})
set(CPACK_SOURCE_PACKAGE_FILE_NAME gmsh-git-source)
else(GMSH_EXTRA_VERSION MATCHES "-git.*")
@@ -45,11 +47,11 @@ index 10690371..3d026607 100644
set(CPACK_SOURCE_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-source)
endif(GMSH_EXTRA_VERSION MATCHES "-git.*")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Gmsh")
-diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt
-index 7cb0c096..c9df4cd9 100644
---- a/wrappers/java/CMakeLists.txt
-+++ b/wrappers/java/CMakeLists.txt
-@@ -34,7 +34,11 @@ if(WIN32)
+Index: gmsh/wrappers/java/CMakeLists.txt
+===================================================================
+--- gmsh.orig/wrappers/java/CMakeLists.txt 2017-11-06 16:25:33.351228762 +0100
++++ gmsh/wrappers/java/CMakeLists.txt 2017-11-06 16:25:33.351228762 +0100
+@@ -34,7 +34,11 @@
set_target_properties(WrapGmsh PROPERTIES PREFIX "")
endif(WIN32)
if(UNIX)
diff --git a/debian/patches/140_drop_css.patch b/debian/patches/140_drop_css.patch
index 7f59e40..31032f9 100644
--- a/debian/patches/140_drop_css.patch
+++ b/debian/patches/140_drop_css.patch
@@ -2,9 +2,11 @@ Description: Drop gmsh.css not to cause a privacy breach.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2017-10-21
---- gmsh-3.0.5+dfsg1.orig/doc/gmsh.html
-+++ gmsh-3.0.5+dfsg1/doc/gmsh.html
-@@ -14,7 +14,6 @@ post processing, post-processor, postpro
+Index: gmsh/doc/gmsh.html
+===================================================================
+--- gmsh.orig/doc/gmsh.html 2017-11-06 16:25:33.835230102 +0100
++++ gmsh/doc/gmsh.html 2017-11-06 16:25:33.831230092 +0100
+@@ -14,7 +14,6 @@
CAO, OpenGL, GL2PS, Gmesh">
<meta name="viewport" content="width= device-width">
<meta name="apple-itunes-app" content="app-id=845930897">
diff --git a/debian/patches/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index 1654e32..3f33f07 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-3.0.5-source/CMakeLists.txt
+Index: gmsh/CMakeLists.txt
===================================================================
---- gmsh-3.0.5-source.orig/CMakeLists.txt
-+++ gmsh-3.0.5-source/CMakeLists.txt
-@@ -1578,7 +1578,6 @@ if(UNIX)
+--- gmsh.orig/CMakeLists.txt 2017-11-06 16:25:33.547229305 +0100
++++ gmsh/CMakeLists.txt 2017-11-06 16:25:33.543229294 +0100
+@@ -1619,7 +1619,6 @@
endif(UNIX)
set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -14,7 +14,7 @@ Index: gmsh-3.0.5-source/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 @@ if(WIN32 OR CYGWIN)
+@@ -1670,7 +1669,6 @@
if(CYGWIN)
unix2dos(GMSH_API)
unix2dos(WELCOME_FILE)
@@ -22,7 +22,7 @@ Index: gmsh-3.0.5-source/CMakeLists.txt
unix2dos(CREDITS_FILE)
unix2dos(CHANGELOG_FILE)
unix2dos(TUTORIAL_FILES)
-@@ -1702,7 +1700,6 @@ if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHAR
+@@ -1744,7 +1742,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,9 +30,9 @@ Index: gmsh-3.0.5-source/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 @@ 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})
+@@ -1852,7 +1849,6 @@
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-source)
+ endif(GMSH_EXTRA_VERSION MATCHES "-git.*")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Gmsh")
-set(CPACK_RESOURCE_FILE_LICENSE ${LICENSE_FILE})
set(CPACK_RESOURCE_FILE_README ${WELCOME_FILE})
diff --git a/debian/patches/30_delete_gl2ps_from_source.patch b/debian/patches/30_delete_gl2ps_from_source.patch
index bc85134..45ef3a0 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-3.0.5-source/Graphics/CMakeLists.txt
+Index: gmsh/Graphics/CMakeLists.txt
===================================================================
---- gmsh-3.0.5-source.orig/Graphics/CMakeLists.txt
-+++ gmsh-3.0.5-source/Graphics/CMakeLists.txt
-@@ -15,7 +15,6 @@ set(SRC
+--- gmsh.orig/Graphics/CMakeLists.txt 2017-11-06 16:25:33.691229704 +0100
++++ gmsh/Graphics/CMakeLists.txt 2017-11-06 16:25:33.687229692 +0100
+@@ -15,7 +15,6 @@
drawScales.cpp
drawGraph2d.cpp
drawGlyph.cpp
@@ -14,11 +14,11 @@ Index: gmsh-3.0.5-source/Graphics/CMakeLists.txt
gl2gif.cpp
gl2jpeg.cpp
gl2png.cpp
-Index: gmsh-3.0.5-source/CMakeLists.txt
+Index: gmsh/CMakeLists.txt
===================================================================
---- gmsh-3.0.5-source.orig/CMakeLists.txt
-+++ gmsh-3.0.5-source/CMakeLists.txt
-@@ -821,6 +821,7 @@ if(HAVE_MESH)
+--- gmsh.orig/CMakeLists.txt 2017-11-06 16:25:33.691229704 +0100
++++ gmsh/CMakeLists.txt 2017-11-06 16:25:33.687229692 +0100
+@@ -833,6 +833,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-3.0.5-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)
-@@ -1416,6 +1417,8 @@ else(HAVE_FLTK)
+@@ -1457,6 +1458,8 @@
set(LINK_LIBRARIES ${EXTERNAL_LIBRARIES} ${LAPACK_LIBRARIES})
endif(HAVE_FLTK)
--
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