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 ef1d472797328e5843007d14788da1cbd03033dc Author: Markus Koschany <[email protected]> Date: Tue Apr 24 18:39:30 2018 +0200 Add java9.patch. --- debian/patches/ant-10.patch | 4 ++-- debian/patches/java9.patch | 52 +++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/debian/patches/ant-10.patch b/debian/patches/ant-10.patch index 0041005..2f8cbd0 100644 --- a/debian/patches/ant-10.patch +++ b/debian/patches/ant-10.patch @@ -8,7 +8,7 @@ Subject: ant 10 2 files changed, 10 insertions(+) diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java -index 85c4da0..1458076 100644 +index 85c4da0..d5b407b 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleSelector.java @@ -61,6 +61,7 @@ import org.apache.tools.ant.BuildException; @@ -31,7 +31,7 @@ index 85c4da0..1458076 100644 validate(); diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java -index 288e22f..45a90db 100644 +index 288e22f..0cfaef0 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java +++ b/nbbuild/antsrc/org/netbeans/nbbuild/ModuleStateSelector.java @@ -58,6 +58,7 @@ import org.apache.tools.ant.BuildException; diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch new file mode 100644 index 0000000..35cb840 --- /dev/null +++ b/debian/patches/java9.patch @@ -0,0 +1,52 @@ +From: Markus Koschany <[email protected]> +Date: Tue, 24 Apr 2018 18:39:21 +0200 +Subject: java9 + +--- + openide.util.lookup/nbproject/project.properties | 2 +- + .../util/lookup/implspi/AbstractServiceProviderProcessor.java | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/openide.util.lookup/nbproject/project.properties b/openide.util.lookup/nbproject/project.properties +index f04bc5b..2511aa0 100644 +--- a/openide.util.lookup/nbproject/project.properties ++++ b/openide.util.lookup/nbproject/project.properties +@@ -41,7 +41,7 @@ + # made subject to such option by the copyright holder. + + module.jar.dir=lib +-javac.source=1.6 ++javac.source=1.7 + javac.compilerargs=-Xlint -Xlint:-serial + + javadoc.arch=${basedir}/arch.xml +diff --git a/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java b/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java +index a3c0eb5..bb7fabb 100644 +--- a/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java ++++ b/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java +@@ -50,6 +50,7 @@ import java.io.OutputStream; + import java.io.OutputStreamWriter; + import java.io.PrintWriter; + import java.lang.annotation.Annotation; ++import java.nio.file.NoSuchFileException; + import java.util.ArrayList; + import java.util.HashMap; + import java.util.List; +@@ -222,7 +223,7 @@ public abstract class AbstractServiceProviderProcessor extends AbstractProcessor + // at com.sun.tools.javac.processing.JavacFiler.getResource(JavacFiler.java:434) + // at org.netbeans.modules.openide.util.AbstractServiceProviderProcessor.register(AbstractServiceProviderProcessor.java:163) + // at org.netbeans.modules.openide.util.ServiceProviderProcessor.register(ServiceProviderProcessor.java:99) +- } catch (FileNotFoundException x) { ++ } catch (FileNotFoundException | NoSuchFileException x) { + // Good. + } + try { +@@ -233,7 +234,7 @@ public abstract class AbstractServiceProviderProcessor extends AbstractProcessor + } finally { + is.close(); + } +- } catch (FileNotFoundException x) { ++ } catch (FileNotFoundException | NoSuchFileException x) { + // OK, created for the first time + } + } catch (IOException x) { diff --git a/debian/patches/series b/debian/patches/series index a3dc737..2a826c2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ netbeans-platform-o.n.html.ko4j.patch gcc-6-ftbfs.patch jna-4.4.0-compatibility.patch ant-10.patch +java9.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
