[gluegen2] 03/07: Fixed the build failure with Java 9 (Closes: #874643)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository gluegen2.

commit c479d0bfcd950621500bdbaef73fc291d148cecb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 5 11:18:40 2017 +0100

    Fixed the build failure with Java 9 (Closes: #874643)
---
 debian/changelog                               |  1 +
 debian/patches/disable-java-version-check.diff | 28 +++++++++++
 debian/patches/rtjar.diff                      | 67 ++++++++++++++++++++++++++
 debian/patches/series                          |  2 +
 4 files changed, 98 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a026e6f..eaf6f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gluegen2 (2.3.2-6) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #874643)
   * Standards-Version updated to 4.1.2
   * Switch to debhelper level 10
 
diff --git a/debian/patches/disable-java-version-check.diff b/debian/patches/disable-java-version-check.diff
new file mode 100644
index 0000000..e3fb75f
--- /dev/null
+++ b/debian/patches/disable-java-version-check.diff
@@ -0,0 +1,28 @@
+Description: Disables the Java version check since the JRE in Debian always
+ meets the minimum requirement and the check routinely breaks with the latest JREs.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/make/jogamp-env.xml
++++ b/make/jogamp-env.xml
+@@ -45,21 +45,6 @@
+       </condition>
+     </fail>
+ 
+-    <fail message="Unsupported Java version: ${ant.java.version}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
+-        <condition>
+-            <not>
+-                <or>
+-                    <equals arg1="${ant.java.version}" arg2="1.6"/>
+-                    <equals arg1="${ant.java.version}" arg2="1.7"/>
+-                    <equals arg1="${ant.java.version}" arg2="1.8"/>
+-                    <equals arg1="${ant.java.version}" arg2="1.9"/>
+-                    <equals arg1="${ant.java.version}" arg2="2.0"/>
+-                    <equals arg1="${ant.java.version}" arg2="2.1"/>
+-                </or>
+-            </not>
+-        </condition>
+-    </fail>
+-
+   </target>
+ 
+   <target name="jogamp.env.init" depends="jogamp.env.validation">
diff --git a/debian/patches/rtjar.diff b/debian/patches/rtjar.diff
new file mode 100644
index 0000000..5820c77
--- /dev/null
+++ b/debian/patches/rtjar.diff
@@ -0,0 +1,67 @@
+Description: No longer use rt.jar which is gone since Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -729,7 +729,6 @@
+            encoding="UTF-8"
+            source="${target.sourcelevel}" 
+            target="${target.targetlevel}" 
+-           bootclasspath="${target.rt.jar}"
+            debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+       <src path="${src.java}" />
+       <src path="${src.generated.java}" />
+@@ -757,7 +756,6 @@
+            encoding="UTF-8"
+            source="${target.sourcelevel}"
+            target="${target.targetlevel}" 
+-           bootclasspath="${host.rt.jar}"
+            debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+       <src path="${src.jcpp}" />
+       <src path="${src.java}" />
+@@ -914,7 +912,6 @@
+            encoding="UTF-8"
+            source="${target.sourcelevel}" 
+            target="${target.targetlevel}" 
+-           bootclasspath="${target.rt.jar}"
+            debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+       <src path="${src.java}" />
+       <src path="${src.generated.java}" />
+@@ -974,7 +971,6 @@
+            encoding="UTF-8"
+            source="${target.sourcelevel}" 
+            target="${target.targetlevel}" 
+-           bootclasspath="${target.rt.jar}"
+            debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+       <src path="${src.java}" />
+       <classpath refid="android.classpath" />
+--- a/make/jogamp-env.xml
++++ b/make/jogamp-env.xml
+@@ -183,13 +183,6 @@
+     <echo message="target.sourcelevel         ${target.sourcelevel}"/>
+     <echo message="target.targetlevel         ${target.targetlevel}"/>
+     <echo message="target.rt.jar              ${target.rt.jar}"/>
+-    <fail message="No target.rt.jar specified not found.">
+-      <condition>
+-        <not>
+-          <isset property="target.rt.jar"/>
+-        </not>
+-      </condition>
+-    </fail>
+ 
+     <property name="host.sourcelevel"         value="${ant.java.version}" />      <!-- default values for compile time components -->
+     <property name="host.targetlevel"         value="${ant.java.version}" />      <!-- default values for compile time components -->
+@@ -206,13 +199,6 @@
+     <echo message="host.sourcelevel           ${host.sourcelevel}"/>
+     <echo message="host.targetlevel           ${host.targetlevel}"/>
+     <echo message="host.rt.jar                ${host.rt.jar}"/>
+-    <fail message="No host.rt.jar specified not found.">
+-      <condition>
+-        <not>
+-          <isset property="host.rt.jar"/>
+-        </not>
+-      </condition>
+-    </fail>
+ 
+     <fail message="Unsupported Target Java version (sourcelevel): ${target.sourcelevel}. Make sure that the version of the Java compiler is 1.6 (6.0) or greater.">
+         <condition>
diff --git a/debian/patches/series b/debian/patches/series
index 774b87c..5a789f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,5 @@ tests.diff
 disable-static-linking.diff
 s390x-support.diff
 non-linux-support.diff
+disable-java-version-check.diff
+rtjar.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gluegen2.git