r47135 - in /packages/gmsh-tetgen/trunk/debian/patches: fix-common-os-cpp.patch petsc.patch series

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Sat Oct 10 14:50:52 2015
New Revision: 47135

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47135
Log:
update patches

Added:
    packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch
    packages/gmsh-tetgen/trunk/debian/patches/petsc.patch
Modified:
    packages/gmsh-tetgen/trunk/debian/patches/series

Added: packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch?rev=47135&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch	(added)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix-common-os-cpp.patch	Sat Oct 10 14:50:52 2015
@@ -0,0 +1,14 @@
+Index: Common/OS.cpp
+===================================================================
+--- gmsh-tetgen-2.9.4~svn21703.orig/Common/OS.cpp	(revision 22026)
++++ gmsh-tetgen-2.9.4~svn21703/Common/OS.cpp	(working copy)
+@@ -405,7 +405,8 @@
+   }
+ #elif defined(__linux__)
+   char path[4096];
+-  if(readlink("/proc/self/exe", path, 4096) > 0){
++  memset(path, 0, sizeof(path));
++  if(readlink("/proc/self/exe", path, sizeof(path)-1) > 0){
+     name = std::string(path);
+   }
+ #endif

Added: packages/gmsh-tetgen/trunk/debian/patches/petsc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/petsc.patch?rev=47135&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/petsc.patch	(added)
+++ packages/gmsh-tetgen/trunk/debian/patches/petsc.patch	Sat Oct 10 14:50:52 2015
@@ -0,0 +1,25 @@
+Index: gmsh-tetgen-2.10.2~svn22060/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.10.2~svn22060.orig/CMakeLists.txt
++++ gmsh-tetgen-2.10.2~svn22060/CMakeLists.txt
+@@ -1029,7 +1029,19 @@ if(HAVE_SOLVER)
+         endif(PETSC_PACKAGES_INCLUDES)
+       endif(PETSC_PACKAGES_INCLUDES)
+       # find libraries (<= 3.0)
+-      set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petsc)
++      set(PETSC_LIBS_REQUIRED petscksp petscdm petscmat petscvec petscsys)
++      foreach(_l ${PETSC_LIBS_REQUIRED})
++        #SET(TMP_${_l} False)
++        FIND_LIBRARY(TMP_${_l} ${_l}
++          ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib
++        )
++        if (TMP_${_l})
++           message(STATUS "${_l} found : ${TMP_${_l}}" )
++          list(APPEND PETSC_LIBS "${TMP_${_l}}")
++        else ()
++          message(STATUS "${_l} not found : ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib" )
++        endif()
++      endforeach()
+       find_all_libraries(PETSC_LIBS PETSC_LIBS_REQUIRED
+                          ${ENV_PETSC_DIR}/${ENV_PETSC_ARCH}/lib "")
+       # petsc 3.1 creates only one library (libpetsc)

Modified: packages/gmsh-tetgen/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/series?rev=47135&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/series	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/series	Sat Oct 10 14:50:52 2015
@@ -25,3 +25,4 @@
 fix-common-os-cpp.patch
 clang.patch
 mmg3d4.0.2.patch
+petsc.patch