This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit 893257d68462c3ff58f9eb1871c54512e7afb611 Author: Markus Koschany <[email protected]> Date: Sat Dec 26 20:44:48 2015 +0100 Add netbeans-CommandLineParser.patch --- debian/patches/netbeans-CommandLineParser.patch | 31 +++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 32 insertions(+) diff --git a/debian/patches/netbeans-CommandLineParser.patch b/debian/patches/netbeans-CommandLineParser.patch new file mode 100644 index 0000000..d87054c --- /dev/null +++ b/debian/patches/netbeans-CommandLineParser.patch @@ -0,0 +1,31 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 26 Dec 2015 20:42:56 +0100 +Subject: netbeans CommandLineParser + +Work around FTBFS error: no suitable method found for addAll(List<CAP#1> + +Forwarded: not-needed +--- + .../api/common/project/ui/customizer/vmo/gen/CommandLineParser.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java b/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java +index c3b9a82..5fa2145 100644 +--- a/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java ++++ b/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLineParser.java +@@ -203,7 +203,7 @@ public class CommandLineParser extends Parser { + if (root instanceof JavaVMOption<?>) { + result.add((JavaVMOption<?>) root); + } else if (root != null) { +- result.addAll(root.getChildren()); ++ //result.addAll(root.getChildren()); + } + } catch (RecognitionException e) { + e.printStackTrace(); +@@ -1282,4 +1282,4 @@ public class CommandLineParser extends Parser { + public static final BitSet FOLLOW_TEXT_in_eText347 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_TEXT_in_nonSwitchOption359 = new BitSet(new long[]{0x0000000000000002L}); + +-} +\ No newline at end of file ++} diff --git a/debian/patches/series b/debian/patches/series index fc9cdc2..6726c20 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -30,3 +30,4 @@ netbeans-svnclient.patch javaewah-version.patch netbeans-wildUpperBound.patch netbeans-com.sun.tools.hc.patch +netbeans-CommandLineParser.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
