[Pkg-octave-commit] [octave] 06/08: java9.patch: new patch, fixes FTBFS with Java 9.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit eb21f1084dd1b6c879d757afb028a105daf25026
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Sep 10 17:33:51 2017 +0200

    java9.patch: new patch, fixes FTBFS with Java 9.
    
    Closes: #873996
---
 debian/patches/java9.patch | 57 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 58 insertions(+)

diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..2708997
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,57 @@
+Description: Fix FTBFS against Java 9
+Origin: backport, https://hg.savannah.gnu.org/hgweb/octave/rev/20c83f619102
+Bug: http://savannah.gnu.org/bugs/?func=detailitem&item_id=51803
+Bug-Debian: https://bugs.debian.org/873996
+Reviewed-by: Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2017-09-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libinterp/octave-value/ov-java.cc
++++ b/libinterp/octave-value/ov-java.cc
+@@ -190,7 +190,7 @@ namespace octave
+ 
+     JVMArgs (void)
+     {
+-      vm_args.version = JNI_VERSION_1_2;
++      vm_args.version = JNI_VERSION_1_6;
+       vm_args.nOptions = 0;
+       vm_args.options = 0;
+       vm_args.ignoreUnrecognized = false;
+@@ -590,12 +590,12 @@ initialize_jvm (void)
+       // At least one JVM exists, try to attach to it
+ 
+       switch (jvm->GetEnv (reinterpret_cast<void **> (&current_env),
+-                           JNI_VERSION_1_2))
++                           JNI_VERSION_1_6))
+         {
+         case JNI_EDETACHED:
+           // Attach the current thread
+           JavaVMAttachArgs vm_args;
+-          vm_args.version = JNI_VERSION_1_2;
++          vm_args.version = JNI_VERSION_1_6;
+           vm_args.name = const_cast<char *> ("octave");
+           vm_args.group = 0;
+           if (jvm->AttachCurrentThread (reinterpret_cast<void **> (&current_env),
+@@ -709,7 +709,7 @@ thread_jni_env (void)
+   JNIEnv *env = 0;
+ 
+   if (jvm)
+-    jvm->GetEnv (reinterpret_cast<void **> (&env), JNI_VERSION_1_2);
++    jvm->GetEnv (reinterpret_cast<void **> (&env), JNI_VERSION_1_6);
+ 
+   return env;
+ }
+--- a/scripts/java/module.mk
++++ b/scripts/java/module.mk
+@@ -35,7 +35,10 @@ scripts_java_JAVA_CLASSES = $(addprefix
+ 
+ $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
+ 	$(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
+-		( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -Xlint:-options -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
++	( cd $(srcdir)/scripts/java; \
++	  "$(JAVAC)" -source 1.6 -target 1.6 -Xlint:-options \
++	             -d $(abs_top_builddir)/scripts/java \
++	             $(org_octave_dir)/$(<F) )
+ 
+ scripts/java/octave.jar: $(scripts_java_JAVA_CLASSES)
+ 	$(AM_V_GEN)rm -f $@-t $@ && \
diff --git a/debian/patches/series b/debian/patches/series
index 73e2688..aad49e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ hdf5-mkoctfile.patch
 appstream-upgrade-spec.patch
 strncmp.patch
 add-corrcoef-function.patch
+java9.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git