[libnb-platform-java] 06/07: Update patch headers.

Markus Koschany apo at moszumanska.debian.org
Tue Apr 24 19:17:10 BST 2018


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

apo pushed a commit to branch master
in repository libnb-platform-java.

commit 5c26e9d708b95d31008860c2e46817a81ce941e5
Author: Markus Koschany <apo at debian.org>
Date:   Tue Apr 24 20:00:34 2018 +0200

    Update patch headers.
---
 debian/patches/ant-10.patch                    | 1 +
 debian/patches/java9.patch                     | 5 +++++
 debian/patches/openide.util.enumerations.patch | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/debian/patches/ant-10.patch b/debian/patches/ant-10.patch
index 2f8cbd0..04f8d75 100644
--- a/debian/patches/ant-10.patch
+++ b/debian/patches/ant-10.patch
@@ -2,6 +2,7 @@ From: Markus Koschany <apo at debian.org>
 Date: Tue, 24 Apr 2018 16:08:39 +0200
 Subject: ant 10
 
+Fix FTBFS with Ant 1.10.
 ---
  nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java      | 5 +++++
  nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java | 5 +++++
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
index c8487b3..345677d 100644
--- a/debian/patches/java9.patch
+++ b/debian/patches/java9.patch
@@ -2,6 +2,11 @@ From: Markus Koschany <apo at debian.org>
 Date: Tue, 24 Apr 2018 18:39:21 +0200
 Subject: java9
 
+Fix FTBFS with Java 9 and apply the upstream fix for bug 259024. Implement
+missing methods and cast Enumeration<TreeNode>.
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893270
+Bug-Upstream: https://netbeans.org/bugzilla/show_bug.cgi?id=259024
 ---
  o.n.bootstrap/src/org/netbeans/NbInstrumentation.java      | 14 ++++++++++++++
  .../src/org/openide/explorer/view/TreeView.java            |  2 +-
diff --git a/debian/patches/openide.util.enumerations.patch b/debian/patches/openide.util.enumerations.patch
index 2aeab1d..441a1c7 100644
--- a/debian/patches/openide.util.enumerations.patch
+++ b/debian/patches/openide.util.enumerations.patch
@@ -2,6 +2,8 @@ From: Markus Koschany <apo at debian.org>
 Date: Tue, 24 Apr 2018 19:46:58 +0200
 Subject: openide.util.enumerations
 
+Disable the openide.util.enumerations module because enum is a keyword and with
+Java 9 this will cause a FTBFS now.
 ---
  nbbuild/cluster.properties | 1 -
  1 file changed, 1 deletion(-)

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



More information about the pkg-java-commits mailing list