[jedit] 06/09: Fix FTBFS with OpenJDK 9.

Markus Koschany apo at moszumanska.debian.org
Wed Nov 29 22:13:05 UTC 2017


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

apo pushed a commit to branch master
in repository jedit.

commit f0e62feb7d4cd8ea8f7f75bcc7ee0433f871e224
Author: Markus Koschany <apo at debian.org>
Date:   Wed Nov 29 22:53:24 2017 +0100

    Fix FTBFS with OpenJDK 9.
    
    Closes: #875583
    Thanks: Chris West for the report.
---
 debian/patches/java9.patch   | 29 +++++++++++++++++++++++++++++
 debian/patches/series.noauto |  1 +
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..387b412
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,29 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 29 Nov 2017 22:52:20 +0100
+Subject: java9
+
+Fix FTBFS with OpenJDK 9.
+
+Forwarded: no
+---
+ build.xml | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index d8022ea..9403501 100644
+--- a/build.xml
++++ b/build.xml
+@@ -75,13 +75,6 @@
+ 				</not>
+ 			</condition>
+ 		</fail>
+-		<fail message="Java 1.8 is needed for jEdit to build, please install it and rerun (found Java version: '${ant.java.version}')">
+-			<condition>
+-				<not>
+-					<equals arg1="1.8" arg2="${ant.java.version}"/>
+-				</not>
+-			</condition>
+-		</fail>
+ 		<fail message="The ant-optional package is needed for jEdit to build, please install it and rerun">
+ 			<condition>
+ 				<not>
diff --git a/debian/patches/series.noauto b/debian/patches/series.noauto
index d93d4fa..898f53b 100644
--- a/debian/patches/series.noauto
+++ b/debian/patches/series.noauto
@@ -4,3 +4,4 @@
 03systemlibs
 04disableivy
 05systemdocbook
+java9.patch

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



More information about the pkg-java-commits mailing list