r46879 - in /packages/gmsh-tetgen/trunk/debian/patches: add-missing-headers.patch change_shared_library_name.patch delete_gl2ps_from_source.patch fix_FTBFS_linking.patch fix_libdir.patch med.patch netgen.patch skip_license_file.patch tetgen.patch

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Wed Aug 20 09:49:46 UTC 2014 

Author: trophime-guest
Date: Wed Aug 20 09:49:45 2014
New Revision: 46879

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

Added:
    packages/gmsh-tetgen/trunk/debian/patches/med.patch
Modified:
    packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch
    packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
    packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch
    packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch
    packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
    packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
    packages/gmsh-tetgen/trunk/debian/patches/tetgen.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=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/add-missing-headers.patch	Wed Aug 20 09:49:45 2014
@@ -3,10 +3,10 @@
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-06-24
 
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 @@ -106,6 +106,7 @@ set(GMSH_API
      Common/VertexArray.h Common/Octree.h Common/OctreeInternals.h 
      Common/OS.h Common/StringUtils.h Common/OpenFile.h
@@ -15,7 +15,7 @@
    Numeric/Numeric.h Numeric/GaussIntegration.h Numeric/polynomialBasis.h
      Numeric/JacobianBasis.h Numeric/MetricBasis.h Numeric/bezierBasis.h Numeric/fullMatrix.h
      Numeric/simpleFunction.h Numeric/cartesian.h Numeric/ElementType.h
-@@ -125,6 +126,7 @@ set(GMSH_API
+@@ -126,6 +127,7 @@ set(GMSH_API
      Mesh/meshGFaceElliptic.h Mesh/meshPartition.h Mesh/meshGFaceDelaunayInsertion.h 
      Mesh/simple3D.h Mesh/meshPartitionOptions.h Mesh/directions3D.h Mesh/yamakawa.h
      Mesh/Voronoi3D.h Mesh/Levy3D.h Mesh/periodical.h Mesh/meshMetric.h
@@ -23,7 +23,7 @@
    Numeric/mathEvaluator.h
    Solver/dofManager.h Solver/femTerm.h Solver/laplaceTerm.h Solver/elasticityTerm.h
      Solver/crossConfTerm.h Solver/orthogonalTerm.h
-@@ -135,6 +137,7 @@ set(GMSH_API
+@@ -137,6 +139,7 @@ set(GMSH_API
    Post/PViewDataList.h Post/PViewDataGModel.h Post/PViewOptions.h Post/ColorTable.h
     Numeric/nodalBasis.h
    Graphics/drawContext.h

Modified: packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch?rev=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/change_shared_library_name.patch	Wed Aug 20 09:49:45 2014
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-11-28
 
-Index: gmsh-tetgen-2.8.5~svn19081/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.8.6~svn19377.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/wrappers/java/CMakeLists.txt
 @@ -34,7 +34,11 @@ if(WIN32)
    set_target_properties(WrapGmsh PROPERTIES PREFIX "")
  endif(WIN32)
@@ -19,11 +19,11 @@
  endif(UNIX)		
  add_custom_command(TARGET WrapGmsh 
  POST_BUILD # do the rest of the command after the build period
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
-@@ -1299,7 +1299,7 @@ endforeach(DIR)
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
+@@ -1301,7 +1301,7 @@ endforeach(DIR)
  # static library target
  if(ENABLE_BUILD_LIB)
    add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1326,10 +1326,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1328,10 +1328,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})

Modified: packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch?rev=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/delete_gl2ps_from_source.patch	Wed Aug 20 09:49:45 2014
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladky.anton at gmail.com>, Julian Taylor <jtaylor.debian at googlemail.com>
 Last-Update: 2011-12-09
 
-Index: gmsh-tetgen-2.8.5~svn19081/Graphics/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/Graphics/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/Graphics/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/Graphics/CMakeLists.txt
+--- gmsh-tetgen-2.8.6~svn19377.orig/Graphics/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/Graphics/CMakeLists.txt
 @@ -15,7 +15,6 @@ set(SRC
    drawScales.cpp 
    drawGraph2d.cpp 
@@ -14,11 +14,11 @@
    gl2gif.cpp
    gl2jpeg.cpp
    gl2png.cpp
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
-@@ -1360,7 +1360,7 @@ else(HAVE_FLTK)
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
+@@ -1362,7 +1362,7 @@ else(HAVE_FLTK)
      add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
    endif(ENABLE_BUILD_DYNAMIC)
  endif(HAVE_FLTK)

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=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_FTBFS_linking.patch	Wed Aug 20 09:49:45 2014
@@ -2,11 +2,11 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-04-08
 
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
-@@ -1337,7 +1337,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
+@@ -1339,7 +1339,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
      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_libdir.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch?rev=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/fix_libdir.patch	Wed Aug 20 09:49:45 2014
@@ -2,10 +2,10 @@
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-03-15
 
-Index: gmsh-tetgen-2.8.5~svn19081/wrappers/java/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/wrappers/java/CMakeLists.txt
+--- gmsh-tetgen-2.8.6~svn19377.orig/wrappers/java/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/wrappers/java/CMakeLists.txt
 @@ -73,6 +73,6 @@ POST_BUILD # do the rest of the command
    COMMAND ${CMAKE_COMMAND} -E copy 
      ${CMAKE_CURRENT_SOURCE_DIR}/WrappingJava/build.xml 
@@ -15,11 +15,11 @@
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
 -        DESTINATION lib)
 +  DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
-@@ -1481,7 +1481,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
+@@ -1483,7 +1483,7 @@ endif(WIN32 OR CYGWIN)
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
  if(ENABLE_BUILD_LIB)
@@ -28,7 +28,7 @@
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
    if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1517,7 +1517,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1519,7 +1519,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
        install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
      endif(GCC_DLL AND STDC_DLL)
    else(WIN32 AND NOT MSVC OR CYGWIN)

Added: packages/gmsh-tetgen/trunk/debian/patches/med.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/med.patch?rev=46879&op=file
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/med.patch	(added)
+++ packages/gmsh-tetgen/trunk/debian/patches/med.patch	Wed Aug 20 09:49:45 2014
@@ -0,0 +1,24 @@
+Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+===================================================================
+--- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+@@ -820,6 +820,10 @@ if(ENABLE_MED OR ENABLE_CGNS)
+         set_config_option(HAVE_MED "Med")
+         list(APPEND EXTERNAL_LIBRARIES ${MED_LIB})
+       endif(MED_LIB)
++      find_library(MEDC_LIB medC)
++      if(MEDC_LIB)
++        list(APPEND EXTERNAL_LIBRARIES ${MEDC_LIB})
++      endif(MEDC_LIB)
+     endif(ENABLE_MED)    
+     if(ENABLE_CGNS)
+       find_library(CGNS_LIB cgns PATHS ENV CGNS_ROOT PATH_SUFFIXES lib)
+@@ -1743,7 +1747,7 @@ message(STATUS "")
+ mark_as_advanced(GMSH_EXTRA_VERSION 
+                  ACIS_LIB ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC CGNS_INC GMM_INC 
+                  GMP_INC GMP_LIB MMG3D_INC MMG3D_LIB TAUCS_INC TAUCS_LIB HDF5_LIB 
+-                 MED_LIB OCC_INC OCC_CONFIG_H SZ_LIB 
++                 MED_LIB MEDC_LIB OCC_INC OCC_CONFIG_H SZ_LIB 
+                  PETSC_LIBS SLEPC_INC SLEPC_INC2 SLEPC_LIB
+                  BISON FLEX MAKEINFO TEXI2PDF FLTK_CONFIG_SCRIPT
+                  GMSH_EXTERNAL_INCLUDE_DIRS GMSH_EXTERNAL_LIBRARIES)

Modified: packages/gmsh-tetgen/trunk/debian/patches/netgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/netgen.patch?rev=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/netgen.patch	Wed Aug 20 09:49:45 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
-@@ -723,10 +723,36 @@ if(HAVE_MESH)
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
+@@ -725,10 +725,36 @@ if(HAVE_MESH)
    endif(ENABLE_BLOSSOM)
  
    if(ENABLE_NETGEN)
@@ -41,7 +41,7 @@
      add_definitions(-DNO_PARALLEL_THREADS -DNOTCL)
    endif(ENABLE_NETGEN)
  
-@@ -1071,8 +1097,13 @@ if(ENABLE_OCC)
+@@ -1073,8 +1099,13 @@ if(ENABLE_OCC)
        add_definitions(-DSGEOMGEOMETRY)
        set_config_option(HAVE_SGEOM "SGEOM")
      elseif(ENABLE_SALOME)
@@ -57,10 +57,10 @@
        add_definitions(-DOCCGEOMETRY)
        set_config_option(HAVE_SALOME "Salome")
      endif(ENABLE_SGEOM)
-Index: gmsh-tetgen-2.8.5~svn19081/contrib/Netgen/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/contrib/Netgen/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/contrib/Netgen/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/contrib/Netgen/CMakeLists.txt
+--- gmsh-tetgen-2.8.6~svn19377.orig/contrib/Netgen/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/contrib/Netgen/CMakeLists.txt
 @@ -3,38 +3,42 @@
  # See the LICENSE.txt file for license information. Please report all
  # bugs and problems to the public mailing list <gmsh at geuz.org>.

Modified: packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch?rev=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/skip_license_file.patch	Wed Aug 20 09:49:45 2014
@@ -2,11 +2,11 @@
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2011-12-09
 
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
-@@ -1411,7 +1411,7 @@ if(UNIX)
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
+@@ -1413,7 +1413,7 @@ if(UNIX)
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@
  set(CREDITS_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/CREDITS.txt)
  set(ONELAB_PY ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab/python/onelab.py)
  file(GLOB TUTORIAL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tutorial/?*.*)
-@@ -1576,7 +1576,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1578,7 +1578,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz

Modified: packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch?rev=46879&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch	(original)
+++ packages/gmsh-tetgen/trunk/debian/patches/tetgen.patch	Wed Aug 20 09:49:45 2014
@@ -1,8 +1,8 @@
-Index: gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
+Index: gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
 ===================================================================
---- gmsh-tetgen-2.8.5~svn19081.orig/CMakeLists.txt
-+++ gmsh-tetgen-2.8.5~svn19081/CMakeLists.txt
-@@ -776,29 +776,30 @@ if(HAVE_MESH)
+--- gmsh-tetgen-2.8.6~svn19377.orig/CMakeLists.txt
++++ gmsh-tetgen-2.8.6~svn19377/CMakeLists.txt
+@@ -778,29 +778,30 @@ if(HAVE_MESH)
      set_config_option(HAVE_MMG3D "Mmg3d")
    endif(ENABLE_MMG3D)

More information about the debian-science-commits mailing list