[gmsh] 03/04: update patch

[Nico Schlömer]

This is an automated email from the git hooks/post-receive script.

nschloe-guest pushed a commit to branch master
in repository gmsh.

commit f52369b7de734ff0abd4af2a9689db8bd30c68e7
Author: Nico Schlömer <nico.schloemer at gmail.com>
Date:   Mon Nov 6 16:24:19 2017 +0100

    update patch
---
 debian/patches/10_change_shared_library_name.patch | 65 ++++++++++++++--------
 1 file changed, 41 insertions(+), 24 deletions(-)

diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index 8cb74ed..dd083c7 100644
--- a/debian/patches/10_change_shared_library_name.patch
+++ b/debian/patches/10_change_shared_library_name.patch
@@ -1,29 +1,11 @@
 Description: Change name of shared library
 Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-11-28
+Last-Update: 2017-11-06
 
-Index: gmsh-3.0.5-source/wrappers/java/CMakeLists.txt
-===================================================================
---- 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)
--  set_target_properties(WrapGmsh PROPERTIES PREFIX "lib")
-+  set_target_properties(WrapGmsh PROPERTIES 
-+    PREFIX "lib"
-+    OUTPUT_NAME java-gmsh
-+    SOVERSION "${GMSH_MAJOR_VERSION}"
-+  )
- endif(UNIX)		
- add_custom_command(TARGET WrapGmsh 
- POST_BUILD # do the rest of the command after the build period
-Index: gmsh-3.0.5-source/CMakeLists.txt
-===================================================================
---- gmsh-3.0.5-source.orig/CMakeLists.txt
-+++ gmsh-3.0.5-source/CMakeLists.txt
-@@ -1460,7 +1460,7 @@ endforeach(DIR)
+index 10690371..3d026607 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1501,7 +1501,7 @@ endforeach(DIR)
  # static library target
  if(ENABLE_BUILD_LIB)
    add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +14,16 @@ Index: gmsh-3.0.5-source/CMakeLists.txt
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1492,10 +1492,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1523,7 +1523,7 @@ if(ENABLE_BUILD_ANDROID)
+   add_definitions(-DBUILD_ANDROID)
+   add_definitions(-DPICOJSON_USE_LOCALE=0)
+   add_library(androidGmsh SHARED ${GMSH_SRC})
+-  set_target_properties(androidGmsh PROPERTIES OUTPUT_NAME Gmsh)
++  set_target_properties(androidGmsh PROPERTIES OUTPUT_NAME gmsh)
+   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)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR
     ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
    add_library(shared SHARED ${GMSH_SRC})
@@ -45,3 +36,29 @@ Index: gmsh-3.0.5-source/CMakeLists.txt
    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
+   set(CPACK_PACKAGE_FILE_NAME gmsh-git-${GMSH_OS})
+   set(CPACK_SOURCE_PACKAGE_FILE_NAME gmsh-git-source)
+ else(GMSH_EXTRA_VERSION MATCHES "-git.*")
+-  set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})      
++  set(CPACK_PACKAGE_FILE_NAME gmsh-${GMSH_VERSION}-${GMSH_OS})
+   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)
+   set_target_properties(WrapGmsh PROPERTIES PREFIX "")
+ endif(WIN32)
+ if(UNIX)
+-  set_target_properties(WrapGmsh PROPERTIES PREFIX "lib")
++  set_target_properties(WrapGmsh PROPERTIES
++    PREFIX "lib"
++    OUTPUT_NAME java-gmsh
++    SOVERSION "${GMSH_MAJOR_VERSION}"
++  )
+ endif(UNIX)
+ add_custom_command(TARGET WrapGmsh
+ POST_BUILD # do the rest of the command after the build period

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git