[gmsh] 03/06: Update/refresh patches.

Anton Gladky gladk at moszumanska.debian.org
Thu Aug 11 19:04:23 UTC 2016 

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

gladk pushed a commit to branch master
in repository gmsh.

commit ca54124c03fb890dbc2f7721e5387fd757cd632b
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Aug 11 20:49:00 2016 +0200

    Update/refresh patches.
---
 debian/patches/10_change_shared_library_name.patch | 16 ++++++-------
 debian/patches/110_fix_cmake_hdf5.patch            | 10 ++++----
 debian/patches/120_relax_python_vers.patch         |  8 +++----
 debian/patches/130_gcc6_fix.patch                  | 27 ----------------------
 debian/patches/140_fix_java.patch                  | 17 --------------
 debian/patches/150_fix_texifile.patch              | 15 ------------
 debian/patches/20_skip_license_file.patch          | 10 ++++----
 debian/patches/30_delete_gl2ps_from_source.patch   | 16 ++++++-------
 .../40_switch_from_opencascade_to_oce.patch        | 12 +++++-----
 debian/patches/60_fix_gmshpy_import.patch          |  6 ++---
 debian/patches/70_fix_libdir.patch                 | 16 ++++++-------
 debian/patches/80_fix_script_header.patch          |  8 +++----
 .../patches/90_fix_java_wrapper_compilation.patch  |  6 ++---
 debian/patches/series                              |  3 ---
 14 files changed, 54 insertions(+), 116 deletions(-)

diff --git a/debian/patches/10_change_shared_library_name.patch b/debian/patches/10_change_shared_library_name.patch
index aab59ac..c16d4c4 100644
--- a/debian/patches/10_change_shared_library_name.patch
+++ b/debian/patches/10_change_shared_library_name.patch
@@ -2,10 +2,10 @@ Description: Change name of shared library
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-11-28
 
-Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.13.1-source/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.13.1-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.13.1-source/wrappers/java/CMakeLists.txt
 @@ -34,7 +34,11 @@ if(WIN32)
    set_target_properties(WrapGmsh PROPERTIES PREFIX "")
  endif(WIN32)
@@ -19,11 +19,11 @@ Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
  endif(UNIX)		
  add_custom_command(TARGET WrapGmsh 
  POST_BUILD # do the rest of the command after the build period
-Index: gmsh-2.12.0-source/CMakeLists.txt
+Index: gmsh-2.13.1-source/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -1442,7 +1442,7 @@ endforeach(DIR)
+--- gmsh-2.13.1-source.orig/CMakeLists.txt
++++ gmsh-2.13.1-source/CMakeLists.txt
+@@ -1459,7 +1459,7 @@ endforeach(DIR)
  # static library target
  if(ENABLE_BUILD_LIB)
    add_library(lib STATIC ${GMSH_SRC})
@@ -32,7 +32,7 @@ Index: gmsh-2.12.0-source/CMakeLists.txt
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d)
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1469,10 +1469,10 @@ endif(ENABLE_BUILD_ANDROID)
+@@ -1486,10 +1486,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})
diff --git a/debian/patches/110_fix_cmake_hdf5.patch b/debian/patches/110_fix_cmake_hdf5.patch
index a3d63cf..8cd86ec 100644
--- a/debian/patches/110_fix_cmake_hdf5.patch
+++ b/debian/patches/110_fix_cmake_hdf5.patch
@@ -1,9 +1,9 @@
 Description: _fix_cmake_hdf5
-Index: gmsh-2.12.0-source/CMakeLists.txt
+Index: gmsh-2.13.1-source/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -826,8 +826,10 @@ if(ENABLE_FOURIER_MODEL)
+--- gmsh-2.13.1-source.orig/CMakeLists.txt
++++ gmsh-2.13.1-source/CMakeLists.txt
+@@ -828,8 +828,10 @@ if(ENABLE_FOURIER_MODEL)
  endif(ENABLE_FOURIER_MODEL)
  
  if(ENABLE_MED OR ENABLE_CGNS)
@@ -16,7 +16,7 @@ Index: gmsh-2.12.0-source/CMakeLists.txt
      if(ENABLE_MED)
        find_library(MED_LIB med)
        if(MED_LIB)
-@@ -858,9 +860,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
+@@ -860,9 +862,9 @@ if(ENABLE_MED OR ENABLE_CGNS)
          endif(ZLIB_FOUND)
        endif(NOT HAVE_LIBZ)
      endif(MED_LIB OR CGNS_LIB)
diff --git a/debian/patches/120_relax_python_vers.patch b/debian/patches/120_relax_python_vers.patch
index 72b761f..c99c66e 100644
--- a/debian/patches/120_relax_python_vers.patch
+++ b/debian/patches/120_relax_python_vers.patch
@@ -2,11 +2,11 @@ Description: relax check of python libraries
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-05-26
 
-Index: gmsh-2.12.0-source/CMakeLists.txt
+Index: gmsh-2.13.1-source/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -1205,7 +1205,7 @@ endif(ENABLE_ZIPPER)
+--- gmsh-2.13.1-source.orig/CMakeLists.txt
++++ gmsh-2.13.1-source/CMakeLists.txt
+@@ -1217,7 +1217,7 @@ endif(ENABLE_ZIPPER)
  if(ENABLE_WRAP_PYTHON)
    find_package(SWIG)
    find_package(PythonLibs)
diff --git a/debian/patches/130_gcc6_fix.patch b/debian/patches/130_gcc6_fix.patch
deleted file mode 100644
index b26e375..0000000
--- a/debian/patches/130_gcc6_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix narrow conversion error with GCC-6
-Author: Anton Gladky <gladk at debian.org>
-Bug-Debian: https://bugs.debian.org/811792
-Last-Update: 2016-01-30
-
-Index: gmsh-2.12.0-source/Fltk/FlGui.cpp
-===================================================================
---- gmsh-2.12.0-source.orig/Fltk/FlGui.cpp
-+++ gmsh-2.12.0-source/Fltk/FlGui.cpp
-@@ -370,7 +370,7 @@ FlGui::FlGui(int argc, char **argv)
-   // nothing to do here
- #else
-   fl_open_display();
--  static char gmsh32x32[] = {
-+  static unsigned char gmsh32x32[] = {
-     0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x40, 0x03, 0x00,
-     0x00, 0x40, 0x03, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x20, 0x07, 0x00,
-     0x00, 0x10, 0x0f, 0x00, 0x00, 0x10, 0x0f, 0x00, 0x00, 0x08, 0x1f, 0x00,
-@@ -384,7 +384,7 @@ FlGui::FlGui(int argc, char **argv)
-     0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};
-   graph[0]->getWindow()->icon
-     ((const char*)XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
--                                        gmsh32x32, 32, 32));
-+                                        (char*)(gmsh32x32), 32, 32));
- #endif
- 
-   graph[0]->getWindow()->show(argc >0 ? 1 : 0, argv);
diff --git a/debian/patches/140_fix_java.patch b/debian/patches/140_fix_java.patch
deleted file mode 100644
index de96d1f..0000000
--- a/debian/patches/140_fix_java.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: add_physical declaration is changed.
- Update java-interface.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-03-21
-
---- gmsh-2.12.0+dfsg1.orig/wrappers/java/WrapGmsh.i
-+++ gmsh-2.12.0+dfsg1/wrappers/java/WrapGmsh.i
-@@ -53,7 +53,8 @@ extern int GModel::indexMeshVertices(boo
- extern int GmshInitialize(int argc, char **argv);
- extern int GmshFinalize();
- extern Vertex *Create_Vertex(int Num, double X, double Y, double Z, double lc, double u);
--extern void add_physical(std::string type, List_T *list, std::string fileName);
-+extern void add_physical(std::string type, List_T *list, std::string fileName, 
-+	const std::string &name, int forceTag, bool append, const std::string &mode);
- 
- //use the Vector object defined in Java language to wrap the std vector.
- %include "std_vector.i"
diff --git a/debian/patches/150_fix_texifile.patch b/debian/patches/150_fix_texifile.patch
deleted file mode 100644
index 3725200..0000000
--- a/debian/patches/150_fix_texifile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix compilation of pdf.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-03-21
-
---- gmsh-2.12.0+dfsg1.orig/doc/texinfo/gmsh.texi
-+++ gmsh-2.12.0+dfsg1/doc/texinfo/gmsh.texi
-@@ -1008,7 +1008,7 @@ parsing of the script file:
-   Exists(@var{string}) | Exists(@var{string}~@{ @var{expression} @}) |
-   FileExists(@var{char-expression}) |
-   StringToName(@var{char-expression}) | S2N(@var{char-expression}) |
--  GetNumber(@var{char-expression} <,@{expression}>) |
-+  GetNumber(@var{char-expression} <@var{expression}>) |
-   GetValue("@var{string}", @var{expression}) |
-   DefineNumber(@var{expression}, @var{onelab-options}) |
- @end example
diff --git a/debian/patches/20_skip_license_file.patch b/debian/patches/20_skip_license_file.patch
index 77cf6a0..110310b 100644
--- a/debian/patches/20_skip_license_file.patch
+++ b/debian/patches/20_skip_license_file.patch
@@ -2,11 +2,11 @@ Description: skips LICENSE.txt during installation. All information is in debian
 Author: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-11-28
 
-Index: gmsh-2.12.0-source/CMakeLists.txt
+Index: gmsh-2.13.1-source/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -1555,7 +1555,7 @@ if(UNIX)
+--- gmsh-2.13.1-source.orig/CMakeLists.txt
++++ gmsh-2.13.1-source/CMakeLists.txt
+@@ -1572,7 +1572,7 @@ if(UNIX)
  endif(UNIX)
  
  set(WELCOME_FILE ${CMAKE_CURRENT_SOURCE_DIR}/doc/WELCOME.txt)
@@ -15,7 +15,7 @@ Index: gmsh-2.12.0-source/CMakeLists.txt
  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/?*.*)
-@@ -1722,7 +1722,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+@@ -1739,7 +1739,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
diff --git a/debian/patches/30_delete_gl2ps_from_source.patch b/debian/patches/30_delete_gl2ps_from_source.patch
index 2430cb6..0f9e59d 100644
--- a/debian/patches/30_delete_gl2ps_from_source.patch
+++ b/debian/patches/30_delete_gl2ps_from_source.patch
@@ -2,10 +2,10 @@ 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+dfsg1/Graphics/CMakeLists.txt
+Index: gmsh-2.13.1-source/Graphics/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0+dfsg1.orig/Graphics/CMakeLists.txt
-+++ gmsh-2.12.0+dfsg1/Graphics/CMakeLists.txt
+--- gmsh-2.13.1-source.orig/Graphics/CMakeLists.txt
++++ gmsh-2.13.1-source/Graphics/CMakeLists.txt
 @@ -15,7 +15,6 @@ set(SRC
    drawScales.cpp 
    drawGraph2d.cpp 
@@ -14,11 +14,11 @@ Index: gmsh-2.12.0+dfsg1/Graphics/CMakeLists.txt
    gl2gif.cpp
    gl2jpeg.cpp
    gl2png.cpp
-Index: gmsh-2.12.0+dfsg1/CMakeLists.txt
+Index: gmsh-2.13.1-source/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0+dfsg1.orig/CMakeLists.txt
-+++ gmsh-2.12.0+dfsg1/CMakeLists.txt
-@@ -806,6 +806,7 @@ if(HAVE_MESH)
+--- gmsh-2.13.1-source.orig/CMakeLists.txt
++++ gmsh-2.13.1-source/CMakeLists.txt
+@@ -808,6 +808,7 @@ if(HAVE_MESH)
      if(TETGEN_LIB AND TETGEN_INC)
        list(APPEND EXTERNAL_LIBRARIES ${TETGEN_LIB})
        list(APPEND EXTERNAL_INCLUDES ${TETGEN_INC})
@@ -26,7 +26,7 @@ Index: gmsh-2.12.0+dfsg1/CMakeLists.txt
        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)
+@@ -1415,6 +1416,8 @@ else(HAVE_FLTK)
    set(LINK_LIBRARIES ${EXTERNAL_LIBRARIES} ${LAPACK_LIBRARIES})
  endif(HAVE_FLTK)
  
diff --git a/debian/patches/40_switch_from_opencascade_to_oce.patch b/debian/patches/40_switch_from_opencascade_to_oce.patch
index cb63464..1595478 100644
--- a/debian/patches/40_switch_from_opencascade_to_oce.patch
+++ b/debian/patches/40_switch_from_opencascade_to_oce.patch
@@ -4,11 +4,11 @@ Author: D. Barbier <bouzim at gmail.com>
 Reviewed-by: Anton Gladky <gladky.anton at gmail.com>
 Last-Update: 2012-02-10
 
-Index: gmsh-2.12.0-source/CMakeLists.txt
+Index: gmsh-2.13.1-source/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -1069,15 +1069,6 @@ if(HAVE_SOLVER)
+--- gmsh-2.13.1-source.orig/CMakeLists.txt
++++ gmsh-2.13.1-source/CMakeLists.txt
+@@ -1082,15 +1082,6 @@ if(HAVE_SOLVER)
  endif(HAVE_SOLVER)
  
  if(ENABLE_OCC)
@@ -24,7 +24,7 @@ Index: gmsh-2.12.0-source/CMakeLists.txt
    set(OCC_LIBS_REQUIRED
        # subset of DataExchange
        TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
-@@ -1089,6 +1080,30 @@ if(ENABLE_OCC)
+@@ -1102,6 +1093,30 @@ if(ENABLE_OCC)
        # FoundationClasses
        # TKAdvTools -- not necessary? (and removed from OCC 6.8)
        TKMath TKernel)
@@ -55,7 +55,7 @@ Index: gmsh-2.12.0-source/CMakeLists.txt
    if(ENABLE_SGEOM)
      set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
        # For SGEOM
-@@ -1133,6 +1148,7 @@ if(ENABLE_OCC)
+@@ -1146,6 +1161,7 @@ if(ENABLE_OCC)
        endif(NOT OCC_CONFIG_H)
      endif(OCC_INC)
    endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
diff --git a/debian/patches/60_fix_gmshpy_import.patch b/debian/patches/60_fix_gmshpy_import.patch
index 8eac31b..5620d9c 100644
--- a/debian/patches/60_fix_gmshpy_import.patch
+++ b/debian/patches/60_fix_gmshpy_import.patch
@@ -3,10 +3,10 @@ Author: Anton Gladky <gladk at debian.org>
 Bug-Debian: http://bugs.debian.org/696420
 Last-Update: 2014-02-06
 
-Index: gmsh-2.12.0+dfsg1/wrappers/gmshpy/__init__.py.in
+Index: gmsh-2.13.1-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
+--- gmsh-2.13.1-source.orig/wrappers/gmshpy/__init__.py.in
++++ gmsh-2.13.1-source/wrappers/gmshpy/__init__.py.in
 @@ -1,4 +1,7 @@
  # set Ctrl-C to default signal (terminates immediately)
 +from ctypes import *
diff --git a/debian/patches/70_fix_libdir.patch b/debian/patches/70_fix_libdir.patch
index d76e605..e217ec2 100644
--- a/debian/patches/70_fix_libdir.patch
+++ b/debian/patches/70_fix_libdir.patch
@@ -2,10 +2,10 @@ Description: install libs into ${INSTALL_LIB_DIR}, needed for multiarch
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-03-15
 
-Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.13.1-source/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.13.1-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.13.1-source/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 @@ Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/WrappingJava/WrapGmsh.jar 
 -        DESTINATION lib)
 +  DESTINATION ${INSTALL_LIB_DIR})
-Index: gmsh-2.12.0-source/CMakeLists.txt
+Index: gmsh-2.13.1-source/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/CMakeLists.txt
-+++ gmsh-2.12.0-source/CMakeLists.txt
-@@ -1638,7 +1638,7 @@ endif(WIN32 OR CYGWIN)
+--- gmsh-2.13.1-source.orig/CMakeLists.txt
++++ gmsh-2.13.1-source/CMakeLists.txt
+@@ -1658,7 +1658,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 @@ Index: gmsh-2.12.0-source/CMakeLists.txt
  endif(ENABLE_BUILD_LIB)
  if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
    if(WIN32 AND NOT MSVC OR CYGWIN)
-@@ -1674,7 +1674,7 @@ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_D
+@@ -1694,7 +1694,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)
diff --git a/debian/patches/80_fix_script_header.patch b/debian/patches/80_fix_script_header.patch
index 1d31b2c..900299a 100644
--- a/debian/patches/80_fix_script_header.patch
+++ b/debian/patches/80_fix_script_header.patch
@@ -2,10 +2,10 @@ Description: add header into onelab
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-05-12
 
-Index: gmsh-2.12.0-source/contrib/onelab/python/onelab.py
+Index: gmsh-2.13.1-source/contrib/onelab/python/onelab.py
 ===================================================================
---- gmsh-2.12.0-source.orig/contrib/onelab/python/onelab.py
-+++ gmsh-2.12.0-source/contrib/onelab/python/onelab.py
+--- gmsh-2.13.1-source.orig/contrib/onelab/python/onelab.py
++++ gmsh-2.13.1-source/contrib/onelab/python/onelab.py
 @@ -27,6 +27,8 @@ Please report all bugs and problems to t
  <gmsh at onelab.info>.
  """
@@ -13,5 +13,5 @@ Index: gmsh-2.12.0-source/contrib/onelab/python/onelab.py
 +#!/usr/bin/env python
 +
  import socket, struct, os, sys, subprocess, time
- _VERSION = '1.1'
+ _VERSION = '1.2'
  
diff --git a/debian/patches/90_fix_java_wrapper_compilation.patch b/debian/patches/90_fix_java_wrapper_compilation.patch
index 58dbb23..121db36 100644
--- a/debian/patches/90_fix_java_wrapper_compilation.patch
+++ b/debian/patches/90_fix_java_wrapper_compilation.patch
@@ -2,10 +2,10 @@ Description: <short summary of the patch>
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2013-07-24
 
-Index: gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
+Index: gmsh-2.13.1-source/wrappers/java/CMakeLists.txt
 ===================================================================
---- gmsh-2.12.0-source.orig/wrappers/java/CMakeLists.txt
-+++ gmsh-2.12.0-source/wrappers/java/CMakeLists.txt
+--- gmsh-2.13.1-source.orig/wrappers/java/CMakeLists.txt
++++ gmsh-2.13.1-source/wrappers/java/CMakeLists.txt
 @@ -13,7 +13,7 @@ include_directories(${JAVA_INCLUDE_PATH}
  include_directories(${JAVA_INCLUDE_PATH2})
  include_directories(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/debian/patches/series b/debian/patches/series
index 156e38a..693748c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,3 @@
 90_fix_java_wrapper_compilation.patch
 110_fix_cmake_hdf5.patch
 120_relax_python_vers.patch
-130_gcc6_fix.patch
-140_fix_java.patch
-150_fix_texifile.patch

-- 
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