[gmsh] 02/06: Fix wrapper for Java.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository gmsh.

commit 81906376574b7796c8ddf4baef54b828413357a8
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Oct 18 21:02:53 2017 +0200

    Fix wrapper for Java.
---
 debian/patches/130_Java_Fix.patch | 21 +++++++++++++++++++++
 debian/patches/series             |  4 +---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/patches/130_Java_Fix.patch b/debian/patches/130_Java_Fix.patch
new file mode 100644
index 0000000..b867c85
--- /dev/null
+++ b/debian/patches/130_Java_Fix.patch
@@ -0,0 +1,21 @@
+Description: Fix wrapper for Java
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2017-10-18
+
+--- gmsh-3.0.5+dfsg1.orig/wrappers/java/WrapGmsh.i
++++ gmsh-3.0.5+dfsg1/wrappers/java/WrapGmsh.i
+@@ -52,10 +52,10 @@ enum meshGenerationStatus {PENDING, DONE
+ extern int GModel::indexMeshVertices(bool all, int singlePartition);
+ 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,
+-                         const std::string &name, int forceTag, bool append,
+-                         const std::string &mode);
++extern Vertex *CreateVertex(int Num, double X, double Y, double Z, double lc, double u);
++extern void add_remove_physical(const std::string &fileName, const std::string &what,
++                         const std::vector<int> &l, 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"
+ namespace std {
diff --git a/debian/patches/series b/debian/patches/series
index 4548e43..738a2ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,9 @@
 10_change_shared_library_name.patch
 20_skip_license_file.patch
 30_delete_gl2ps_from_source.patch
-# 40_switch_from_opencascade_to_oce.patch
 60_fix_gmshpy_import.patch
 70_fix_libdir.patch
 80_fix_script_header.patch
 90_fix_java_wrapper_compilation.patch
 110_fix_cmake_hdf5.patch
-# 120_relax_python_vers.patch # fixed upstream
-120_Java_Fix.patch
+130_Java_Fix.patch

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