From: Markus Koschany <apo@debian.org>
Date: Sat, 23 Feb 2019 16:32:26 +0100
Subject: java11

Fix FTBFS with Java 9+. The javah tool is gone, nativeHeaderDir in Ant must be
used instead. The method getPeer() does not exist anymore.

Bug-Debian: https://bugs.debian.org/893287
Forwarded: sgothel@jausoft.com
---
 make/build-jogl.xml                                  |  9 ++++++---
 make/build-nativewindow.xml                          |  5 ++++-
 make/build-newt.xml                                  | 11 +----------
 src/jogl/classes/com/jogamp/opengl/awt/GLCanvas.java |  4 ++--
 4 files changed, 13 insertions(+), 16 deletions(-)

--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -838,6 +838,7 @@
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
                bootclasspath="${target.rt.jar}"
+               nativeHeaderDir="${build.jogl}/gensrc/native/jogl"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="gluegen-gl.classpath"/>
             <src path="${src.java}" />
@@ -1112,6 +1113,7 @@
                source="${target.sourcelevel}" 
                target="${target.targetlevel}"
                bootclasspath="${target.rt.jar}"
+               nativeHeaderDir="${build.jogl}/gensrc/native/jogl"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <include name="jogamp/opengl/GLDebugMessageHandler.java" />
@@ -1241,6 +1243,7 @@
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
                bootclasspath="${target.rt.jar}"
+               nativeHeaderDir="${build.jogl}/gensrc/native/jogl"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="nativewindow_gluegen.classpath"/>
             <src path="${src.java}" />
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -90,6 +90,9 @@
         <property name="java.part.ios"
                   value="com/jogamp/nativewindow/ios/* jogamp/nativewindow/ios/*" />
 
+        <property name="java.lib.dir.platform"
+                  value="/usr/lib/jvm/default-java/lib" />
+
         <!-- condition excludes -->
 
         <condition property="java.excludes.awt" value="${java.part.awt}">
@@ -461,6 +464,7 @@
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
                bootclasspath="${target.rt.jar}"
+               nativeHeaderDir="${src.generated.c}/X11"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <classpath refid="swt_gluegen.classpath"/>
             <src path="${src.java}" />
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -456,6 +456,7 @@
                source="${target.sourcelevel}" 
                target="${target.targetlevel}" 
                bootclasspath="${target.rt.jar}"
+               nativeHeaderDir="${src.generated.c}"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
             <src path="${src.java}" />
             <classpath refid="jogl_nativewindow_gluegen.classpath"/>