[gmsh] 02/05: Refresh patches.

Anton Gladky gladk at alioth.debian.org
Sun Sep 29 12:37:54 UTC 2013 

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

gladk pushed a commit to branch master
in repository gmsh.

commit 3266841fcf2d4fcf51b4a044bdfd51c20df64176
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Sep 29 10:36:13 2013 +0200

    Refresh patches.
---
 debian/patches/alauzet.patch                        |   14 +++++++-------
 debian/patches/change_shared_library_name.patch     |    4 ++--
 debian/patches/delete_gl2ps_from_source.patch       |    2 +-
 debian/patches/fix_FTBFS_linking.patch              |    2 +-
 debian/patches/fix_java_wrapper_compilation.patch   |    6 +++---
 debian/patches/fix_libdir.patch                     |    8 ++++----
 debian/patches/skip_license_file.patch              |    4 ++--
 debian/patches/switch_from_opencascade_to_oce.patch |   18 +++++++++---------
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/debian/patches/alauzet.patch b/debian/patches/alauzet.patch
index 7168399..e790d1d 100644
--- a/debian/patches/alauzet.patch
+++ b/debian/patches/alauzet.patch
@@ -1,6 +1,6 @@
 --- a/Mesh/Field.cpp
 +++ b/Mesh/Field.cpp
-@@ -480,6 +480,55 @@
+@@ -485,6 +485,55 @@
    }
  };
  
@@ -56,7 +56,7 @@
  class FrustumField : public Field
  {
    double x1,y1,z1;
-@@ -1281,17 +1330,21 @@
+@@ -1286,17 +1335,21 @@
    }
    virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
    {
@@ -78,7 +78,7 @@
  	}
  	v = intersection_conserve_mostaniso(v,ff);
        }
-@@ -1329,6 +1382,77 @@
+@@ -1334,6 +1387,77 @@
    }
  };
  
@@ -156,7 +156,7 @@
  class MinField : public Field
  {
    std::list<int> idlist;
-@@ -1347,7 +1471,18 @@
+@@ -1352,7 +1476,18 @@
      double v = MAX_LC;
      for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
        Field *f = (GModel::current()->getFields()->get(*it));
@@ -176,7 +176,7 @@
      }
      return v;
    }
-@@ -1375,7 +1510,18 @@
+@@ -1380,7 +1515,18 @@
      double v = -MAX_LC;
      for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
        Field *f = (GModel::current()->getFields()->get(*it));
@@ -196,7 +196,7 @@
      }
      return v;
    }
-@@ -2051,6 +2197,7 @@
+@@ -2148,6 +2294,7 @@
  #endif
    map_type_name["Box"] = new FieldFactoryT<BoxField>();
    map_type_name["Cylinder"] = new FieldFactoryT<CylinderField>();
@@ -204,7 +204,7 @@
    map_type_name["Frustum"] = new FieldFactoryT<FrustumField>();
    map_type_name["LonLat"] = new FieldFactoryT<LonLatField>();
  #if defined(HAVE_POST)
-@@ -2060,6 +2207,7 @@
+@@ -2157,6 +2304,7 @@
    map_type_name["Restrict"] = new FieldFactoryT<RestrictField>();
    map_type_name["Min"] = new FieldFactoryT<MinField>();
    map_type_name["MinAniso"] = new FieldFactoryT<MinAnisoField>();
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 7cc4873..f81ce46 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -19,7 +19,7 @@ Last-Update: 2012-11-28
  POST_BUILD # do the rest of the command after the build period
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1155,7 +1155,7 @@
+@@ -1182,7 +1182,7 @@
  # static library target
  if(ENABLE_BUILD_LIB)
    add_library(lib STATIC ${GMSH_SRC})
@@ -28,7 +28,7 @@ Last-Update: 2012-11-28
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1168,10 +1168,10 @@
+@@ -1195,10 +1195,10 @@
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC OR 
     ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
    add_library(shared SHARED ${GMSH_SRC})
diff --git a/debian/patches/delete_gl2ps_from_source.patch b/debian/patches/delete_gl2ps_from_source.patch
index 93b3efb..8a787e7 100644
--- a/debian/patches/delete_gl2ps_from_source.patch
+++ b/debian/patches/delete_gl2ps_from_source.patch
@@ -14,7 +14,7 @@ Last-Update: 2012-11-28
    gl2png.cpp
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1202,7 +1202,7 @@
+@@ -1229,7 +1229,7 @@
      add_executable(gmsh Common/Main.cpp ${GMSH_SRC})
    endif(ENABLE_BUILD_DYNAMIC)
  endif(HAVE_FLTK)
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
index 89c633d..09595e1 100644
--- a/debian/patches/fix_FTBFS_linking.patch
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1195,7 +1195,7 @@
+@@ -1197,7 +1197,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)		  
diff --git a/debian/patches/fix_java_wrapper_compilation.patch b/debian/patches/fix_java_wrapper_compilation.patch
index c81528f..06117a0 100644
--- a/debian/patches/fix_java_wrapper_compilation.patch
+++ b/debian/patches/fix_java_wrapper_compilation.patch
@@ -2,9 +2,9 @@ Description: <short summary of the patch>
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-07-24
 
---- gmsh-2.8.2+dfsg.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.8.2+dfsg/wrappers/java/CMakeLists.txt
-@@ -13,7 +13,7 @@ include_directories(${JAVA_INCLUDE_PATH}
+--- a/wrappers/java/CMakeLists.txt
++++ b/wrappers/java/CMakeLists.txt
+@@ -13,7 +13,7 @@
  include_directories(${JAVA_INCLUDE_PATH2})
  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
  # define where the interface file (used by SWIG) are
diff --git a/debian/patches/fix_libdir.patch b/debian/patches/fix_libdir.patch
index 499eba3..a17c7ac 100644
--- a/debian/patches/fix_libdir.patch
+++ b/debian/patches/fix_libdir.patch
@@ -15,7 +15,7 @@ Last-Update: 2013-03-15
 +  DESTINATION ${INSTALL_LIB_DIR})
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1334,7 +1334,7 @@
+@@ -1337,7 +1337,7 @@
  # (e.g. "make lib" or "make shared" followed by "make install/fast")
  install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
  if(ENABLE_BUILD_LIB)
@@ -24,9 +24,9 @@ Last-Update: 2013-03-15
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
    if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1353,7 +1353,7 @@
-       install(FILES ${GCC_DLL} ${GFORTRAN_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
-     endif(GCC_DLL AND GFORTRAN_DLL AND STDC_DLL)
+@@ -1377,7 +1377,7 @@
+       install(FILES ${GCC_DLL} ${STDC_DLL} DESTINATION ${GMSH_LIB})
+     endif(GCC_DLL AND STDC_DLL)
    else(WIN32 AND NOT MSVC OR CYGWIN)
 -    install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
 +    install(TARGETS shared DESTINATION ${INSTALL_LIB_DIR} OPTIONAL)
diff --git a/debian/patches/skip_license_file.patch b/debian/patches/skip_license_file.patch
index f92b91c..390add8 100644
--- a/debian/patches/skip_license_file.patch
+++ b/debian/patches/skip_license_file.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-11-28
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1251,7 +1251,7 @@
+@@ -1279,7 +1279,7 @@
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -13,7 +13,7 @@ Last-Update: 2012-11-28
  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/?*.*)
-@@ -1393,7 +1393,7 @@
+@@ -1445,7 +1445,7 @@
  if(MAKEINFO AND TEXI2PDF)
    add_custom_target(doc COMMAND ${CMAKE_COMMAND} -E tar zcf 
                      ${CMAKE_CURRENT_BINARY_DIR}/gmsh-${GMSH_VERSION}-doc.tgz
diff --git a/debian/patches/switch_from_opencascade_to_oce.patch b/debian/patches/switch_from_opencascade_to_oce.patch
index 057a472..4c3ade5 100644
--- a/debian/patches/switch_from_opencascade_to_oce.patch
+++ b/debian/patches/switch_from_opencascade_to_oce.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-02-10
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -919,15 +919,6 @@
+@@ -925,15 +925,6 @@
  endif(HAVE_SOLVER)
  
  if(ENABLE_OCC)
@@ -22,7 +22,7 @@ Last-Update: 2012-02-10
    set(OCC_LIBS_REQUIRED
        # subset of DataExchange
        TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -938,6 +929,30 @@
+@@ -944,6 +935,30 @@
        TKBRep TKGeomBase TKG3d TKG2d
        # FoundationClasses
        TKAdvTools TKMath TKernel)
@@ -50,14 +50,14 @@ Last-Update: 2012-02-10
 +    else(WIN32 OR CYGWIN)
 +      set(OCC_SYS_NAME ${CMAKE_SYSTEM_NAME})
 +    endif(WIN32 OR CYGWIN)
-   list(LENGTH OCC_LIBS_REQUIRED NUM_OCC_LIBS_REQUIRED)
-   set(OCC_LIBS)
-   foreach(OCC ${OCC_LIBS_REQUIRED})
-@@ -973,6 +988,7 @@
+   if(ENABLE_SGEOM)
+     set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
+       # For SGEOM
+@@ -987,6 +1002,7 @@
        endif(NOT OCC_CONFIG_H)
      endif(OCC_INC)
    endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
 +  endif(OCE_ALL_FOUND)
-   if(HAVE_OCC AND ENABLE_SALOME)
-     add_subdirectory(contrib/Salome)
-     include_directories(contrib/Salome)
+   if(HAVE_OCC)
+     if(ENABLE_SGEOM)
+       add_subdirectory(contrib/SGEOM)

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

More information about the debian-science-commits mailing list