r45941 - in /packages/gmsh-tetgen/trunk/debian/patches: add-missing-headers.patch fix_FTBFS_linking.patch fix_gmshpy_import.patch

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Sun May 19 15:10:29 UTC 2013 

Author: trophime-guest
Date: Sun May 19 15:10:28 2013
New Revision: 45941

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

Modified:
    packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch

Modified: packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch?rev=45941&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch Sun May 19 15:10:28 2013
@@ -3,11 +3,11 @@
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-06-24
 
-Index: gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt
+Index: gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.7.1~svn15527.orig/CMakeLists.txt	2013-05-13 13:10:41.000000000 +0200
-+++ gmsh-tetgen-2.7.1~svn15527/CMakeLists.txt	2013-05-13 13:14:16.000000000 +0200
-@@ -64,7 +64,7 @@
+--- gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842.orig/CMakeLists.txt	2013-05-19 17:05:19.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842/CMakeLists.txt	2013-05-19 17:05:19.000000000 +0200
+@@ -65,7 +65,7 @@
  option(ENABLE_PETSC "Enable PETSc linear algebra solvers" ${DEFAULT})
  option(ENABLE_PLUGINS "Build the post-processing plugins" ${DEFAULT})
  option(ENABLE_POST "Build the post-processing module" ${DEFAULT})
@@ -16,7 +16,7 @@
  option(ENABLE_QT "Build proof-of-concept QT GUI" OFF)
  option(ENABLE_RTREE "Enable RTREE" ${DEFAULT})
  option(ENABLE_SALOME "Enable Salome routines for CAD healing" ${DEFAULT})
-@@ -92,6 +92,7 @@
+@@ -93,6 +93,7 @@
    Common/Gmsh.h Common/Context.h Common/GmshDefines.h Common/GmshMessage.h
      Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h 
      Common/OS.h Common/StringUtils.h Common/OpenFile.h
@@ -24,7 +24,7 @@
    Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
      Numeric/JacobianBasis.h Numeric/fullMatrix.h
      Numeric/simpleFunction.h Numeric/cartesian.h
-@@ -107,11 +108,13 @@
+@@ -108,11 +109,13 @@
      Geo/Pair.h Geo/Range.h Geo/SOrientedBoundingBox.h 
      Geo/CellComplex.h Geo/ChainComplex.h Geo/Cell.h Geo/Homology.h Geo/Chain.h 
      Geo/partitionEdge.h Geo/CGNSOptions.h Geo/gmshLevelset.h Geo/boundaryLayersData.h
@@ -39,7 +39,7 @@
    Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
      Solver/crossConfTerm.h Solver/orthogonalTerm.h
      Solver/linearSystem.h Solver/linearSystemGMM.h Solver/linearSystemCSR.h 
-@@ -119,8 +122,9 @@
+@@ -120,8 +123,9 @@
      Solver/groupOfElements.h Solver/linearSystemPETSc.h
    Post/PView.h Post/PViewData.h Plugin/PluginManager.h Post/OctreePost.h 
    Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h

Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch?rev=45941&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch Sun May 19 15:10:28 2013
@@ -2,9 +2,11 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-04-08
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1151,7 +1151,7 @@
+Index: gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842.orig/CMakeLists.txt	2013-05-19 17:05:19.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842/CMakeLists.txt	2013-05-19 17:06:01.000000000 +0200
+@@ -1160,7 +1160,7 @@
      message(STATUS "Note: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library "
              "won't link. In MSVC change /MT to /MD in the shared project properties")
    endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  

Modified: packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch?rev=45941&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_gmshpy_import.patch Sun May 19 15:10:28 2013
@@ -3,8 +3,10 @@
 Bug-Debian: http://bugs.debian.org/696420
 Last-Update: 2013-01-26
 
---- a/wrappers/gmshpy/__init__.py.in
-+++ b/wrappers/gmshpy/__init__.py.in
+Index: gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842/wrappers/gmshpy/__init__.py.in
+===================================================================
+--- gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842.orig/wrappers/gmshpy/__init__.py.in	2013-05-19 16:32:53.000000000 +0200
++++ gmsh-tetgen-2.7.2~svn15595.obsolete.0.391631427061842/wrappers/gmshpy/__init__.py.in	2013-05-19 17:05:19.000000000 +0200
 @@ -1,4 +1,7 @@
  # set Ctrl-C to default signal (terminates immediately)
 +from ctypes import *
@@ -12,4 +14,4 @@
 +
  import signal
  signal.signal(signal.SIGINT, signal.SIG_DFL)
- ${GMSH_PYTHON_MODULES_INCLUDE_CODE}
+ ${GMSH_PYTHON_OPENMPI_HACK}

More information about the debian-science-commits mailing list