[gmsh] 01/04: Fix the name of libmpi in python wrapper.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gmsh.

commit 77f2519ffd4f38f9e574c1d7b154b285e1ce77ef
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Apr 22 23:38:03 2016 +0200

    Fix the name of libmpi in python wrapper.
---
 debian/patches/100_enable_tetgen.patch           | 25 ----------------
 debian/patches/30_delete_gl2ps_from_source.patch | 36 +++++++++++++++---------
 debian/patches/60_fix_gmshpy_import.patch        |  8 +++---
 debian/patches/series                            |  1 -
 4 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/debian/patches/100_enable_tetgen.patch b/debian/patches/100_enable_tetgen.patch
deleted file mode 100644
index e212bce..0000000
--- a/debian/patches/100_enable_tetgen.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Enable TetGen
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-02-10
-
-Index: gmsh-2.12.0-source/CMakeLists.txt
-===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -807,6 +807,7 @@ if(HAVE_MESH)
-       list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
-       list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
-       set_config_option(HAVE_TETGEN "Tetgen")
-+      add_definitions(-DTETLIBRARY)
-     endif(TETGEN_LIB AND TETGEN_INC)
-   endif(ENABLE_TETGEN AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/Tetgen1.5/tetgen.h)
-   if(HAVE_TETGEN)
-@@ -1519,7 +1520,7 @@ else(HAVE_FLTK)
-     add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
-   endif(ENABLE_BUILD_DYNAMIC)
- endif(HAVE_FLTK)
--target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
-+target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut -ltet)
- 
- # Windows specific linker options
- if(WIN32 AND NOT MSVC OR CYGWIN)
diff --git a/debian/patches/30_delete_gl2ps_from_source.patch b/debian/patches/30_delete_gl2ps_from_source.patch
index b3fec5e..2430cb6 100644
--- a/debian/patches/30_delete_gl2ps_from_source.patch
+++ b/debian/patches/30_delete_gl2ps_from_source.patch
@@ -1,11 +1,11 @@
-Description: delete gl2ps and use packaged version.
+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.12.0-source/Graphics/CMakeLists.txt
+Index: gmsh-2.12.0+dfsg1/Graphics/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/Graphics/CMakeLists.txt
-+++ gmsh-2.12.0-source/Graphics/CMakeLists.txt
+--- gmsh-2.12.0+dfsg1.orig/Graphics/CMakeLists.txt
++++ gmsh-2.12.0+dfsg1/Graphics/CMakeLists.txt
 @@ -15,7 +15,6 @@ set(SRC
    drawScales.cpp 
    drawGraph2d.cpp 
@@ -14,16 +14,24 @@ Index: gmsh-2.12.0-source/Graphics/CMakeLists.txt
    gl2gif.cpp
    gl2jpeg.cpp
    gl2png.cpp
-Index: gmsh-2.12.0-source/CMakeLists.txt
+Index: gmsh-2.12.0+dfsg1/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -1503,7 +1503,7 @@ else(HAVE_FLTK)
-     add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
-   endif(ENABLE_BUILD_DYNAMIC)
+--- gmsh-2.12.0+dfsg1.orig/CMakeLists.txt
++++ gmsh-2.12.0+dfsg1/CMakeLists.txt
+@@ -806,6 +806,7 @@ if(HAVE_MESH)
+     if(TETGEN_LIB AND TETGEN_INC)
+       list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
+       list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
++      add_definitions(-DTETLIBRARY)
+       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)
+@@ -1401,6 +1402,8 @@ else(HAVE_FLTK)
+   set(LINK_LIBRARIES ${EXTERNAL_LIBRARIES} ${LAPACK_LIBRARIES})
  endif(HAVE_FLTK)
--target_link_libraries(gmsh ${LINK_LIBRARIES})
-+target_link_libraries(gmsh ${LINK_LIBRARIES} -lgl2ps -lGL -lglut)
  
- # Windows specific linker options
- if(WIN32 AND NOT MSVC OR CYGWIN)
++list(APPEND LINK_LIBRARIES -lgl2ps -lGL -lglut -ltet) 
++ 
+ # Linux-specific linking
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+   # try to use static gfortran on static Linux builds
diff --git a/debian/patches/60_fix_gmshpy_import.patch b/debian/patches/60_fix_gmshpy_import.patch
index 74ec205..8eac31b 100644
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ b/debian/patches/60_fix_gmshpy_import.patch
@@ -3,14 +3,14 @@ Author: Anton Gladky <gladk at debian.org>
 Bug-Debian: http://bugs.debian.org/696420
 Last-Update: 2014-02-06
 
-Index: gmsh-2.12.0-source/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.12.0+dfsg1/wrappers/gmshpy/__init__.py.in
 ===================================================================
---- gmsh-2.12.0-source.orig/wrappers/gmshpy/__init__.py.in
-+++ gmsh-2.12.0-source/wrappers/gmshpy/__init__.py.in
+--- gmsh-2.12.0+dfsg1.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.12.0+dfsg1/wrappers/gmshpy/__init__.py.in
 @@ -1,4 +1,7 @@
  # set Ctrl-C to default signal (terminates immediately)
 +from ctypes import *
-+mpi = CDLL('libmpi.so.1', RTLD_GLOBAL)
++mpi = CDLL('libmpi.so', RTLD_GLOBAL)
 +
  import signal
  signal.signal(signal.SIGINT, signal.SIG_DFL)
diff --git a/debian/patches/series b/debian/patches/series
index fcf6953..156e38a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
 70_fix_libdir.patch
 80_fix_script_header.patch
 90_fix_java_wrapper_compilation.patch
-100_enable_tetgen.patch
 110_fix_cmake_hdf5.patch
 120_relax_python_vers.patch
 130_gcc6_fix.patch

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