This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository electric.
commit 4bc296b736f40575ffa4e7b25b058fd513c28550 Author: Markus Koschany <a...@debian.org> Date: Mon Oct 30 21:49:40 2017 +0100 Add java9.patch and fix FTBFS with OpenJDK 9. Closes: #873219 Thanks: Chris West for the report --- debian/patches/build.patch | 2 +- debian/patches/java9.patch | 29 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/debian/patches/build.patch b/debian/patches/build.patch index f364182..8ca094b 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -8,7 +8,7 @@ Forwarded: not-needed 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/build.xml b/build.xml -index 2d5b1a9..ac20f5c 100644 +index 88371c8..be0bdcd 100644 --- a/build.xml +++ b/build.xml @@ -26,7 +26,7 @@ diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch new file mode 100644 index 0000000..d11b623 --- /dev/null +++ b/debian/patches/java9.patch @@ -0,0 +1,29 @@ +From: Markus Koschany <a...@debian.org> +Date: Mon, 30 Oct 2017 21:49:23 +0100 +Subject: java9 + +I contacted Steven Rubin, the upstream developer of Electric, via the +public bug mailing list. He suggested this patch. I am not sure at this moment +if he intends to apply this fix upstream because he stated: +"Unfortunately, I use Oracle Java, and its implementation of Java 9 +doesn't complain about that line of code." + +Bug-Debian: https://bugs.debian.org/873219 +Bug-Upstream: https://lists.gnu.org/archive/html/bug-gnu-electric/2017-10/msg00000.html +--- + com/sun/electric/tool/user/ui/JobTree.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/com/sun/electric/tool/user/ui/JobTree.java b/com/sun/electric/tool/user/ui/JobTree.java +index eac6ea6..002cfca 100644 +--- a/com/sun/electric/tool/user/ui/JobTree.java ++++ b/com/sun/electric/tool/user/ui/JobTree.java +@@ -223,7 +223,7 @@ public class JobTree extends DefaultMutableTreeNode { + } + } + +- public static class JobTreeNode implements TreeNode ++ public static class JobTreeNode extends DefaultMutableTreeNode + { + private Job.Inform jobInfo; + diff --git a/debian/patches/series b/debian/patches/series index 5879227..d081d40 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ build.patch +java9.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits