This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository openjfx9.
commit 393b2801b5008d04ce35418bff97905d4e5b78b4 Author: Emmanuel Bourg <ebo...@apache.org> Date: Wed Oct 11 14:03:52 2017 +0200 Patched build.gradle to build with a version of OpenJDK 9 that doesn't already contain JavaFX --- debian/changelog | 2 + debian/patches/27-add-java9-exports.patch | 177 ++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 180 insertions(+) diff --git a/debian/changelog b/debian/changelog index f9e72e7..6ee9029 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ openjfx9 (9~b181-1) UNRELEASED; urgency=medium - Updated the watch file to track the Java 9 releases - Updated the paths to the modules (modules/foo -> modules/javafx.foo) - Depend on antlr+stringtemplate instead of antlr-complete + - Patched build.gradle to build with a version of OpenJDK 9 that doesn't + already contain JavaFX. Thanks to Mario Ivankovits. -- Emmanuel Bourg <ebo...@apache.org> Sat, 07 Oct 2017 01:01:42 +0200 diff --git a/debian/patches/27-add-java9-exports.patch b/debian/patches/27-add-java9-exports.patch new file mode 100644 index 0000000..7ae3bc3 --- /dev/null +++ b/debian/patches/27-add-java9-exports.patch @@ -0,0 +1,177 @@ +Description: Adds the missing --add-exports parameters to be able to build with OpenJDK +Author: Mario Ivankovits <ma...@datenwort.at> +Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/020883.html +--- a/build.gradle ++++ b/build.gradle +@@ -1559,6 +1559,11 @@ + + commonModuleSetup(project, [ 'base' ]) + ++ compileJava.options.compilerArgs.addAll([ ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.reflect.misc=javafx.base" ++ ]) ++ + project.ext.moduleSourcePath = defaultModuleSourcePath + project.ext.moduleSourcePathShim = defaultModuleSourcePathShim + +@@ -1609,6 +1614,13 @@ + + getConfigurations().create("antlr"); + ++ compileJava.options.compilerArgs.addAll([ ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.reflect.misc=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.graphics", ++ "--add-exports=java.base/jdk.internal.misc=javafx.graphics" ++ ]) ++ + sourceSets { + jslc // JSLC gramar subset + main +@@ -1705,6 +1717,10 @@ + options.compilerArgs.addAll([ + '-h', "$buildDir/gensrc/headers/", // Note: this creates the native headers + '-implicit:none', ++ '--add-exports=java.base/sun.util.logging=javafx.base', ++ '--add-exports=java.base/sun.reflect.misc=javafx.base', ++ '--add-exports=java.base/sun.util.logging=javafx.graphics', ++ '--add-exports=java.base/jdk.internal.misc=javafx.graphics', + '--module-source-path', defaultModuleSourcePath + ] ) + } +@@ -2025,6 +2041,13 @@ + test + } + ++ compileJava.options.compilerArgs.addAll([ ++ "--add-exports=java.base/sun.reflect.misc=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.graphics", ++ "--add-exports=java.base/sun.util.logging=javafx.controls" ++ ]) ++ + project.ext.moduleSourcePath = defaultModuleSourcePath + project.ext.moduleSourcePathShim = defaultModuleSourcePathShim + +@@ -2090,6 +2113,21 @@ + test + } + ++ compileJava.options.compilerArgs.addAll([ ++ "--add-exports=java.desktop/java.awt.dnd.peer=javafx.swing", ++ "--add-exports=java.desktop/sun.awt.dnd.peer=javafx.swing", ++ "--add-exports=java.desktop/sun.awt.dnd=javafx.swing", ++ "--add-exports=java.desktop/sun.awt.image=javafx.swing", ++ "--add-exports=java.desktop/sun.awt.image=ALL-UNNAMED", ++ "--add-exports=java.desktop/sun.java2d=javafx.swing", ++ "--add-exports=java.desktop/sun.awt=javafx.swing", ++ "--add-exports=java.desktop/sun.swing=javafx.swing", ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.graphics", ++ "--add-exports=java.base/sun.util.logging=javafx.swing", ++ "--add-exports=java.base/sun.reflect.misc=javafx.base", ++ ]) ++ + project.ext.moduleSourcePath = defaultModuleSourcePath + project.ext.moduleSourcePathShim = defaultModuleSourcePathShim + +@@ -2175,6 +2213,14 @@ + project.ext.moduleSourcePath = defaultModuleSourcePath + project.ext.moduleSourcePathShim = defaultModuleSourcePathShim + ++ compileJava.options.compilerArgs.addAll([ ++ "--add-exports=java.base/sun.reflect.misc=javafx.fxml", ++ "--add-exports=java.base/sun.reflect.misc=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.fxml", ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.graphics" ++ ]) ++ + commonModuleSetup(project, [ 'base', 'graphics', 'swing', 'controls', 'fxml' ]) + + +@@ -2724,6 +2770,13 @@ + compileJava { + // generate the native headers during compile + options.compilerArgs.addAll([ ++ "--add-exports=java.base/sun.nio.ch=javafx.media", ++ "--add-exports=java.base/jdk.internal.ref=javafx.media", ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.reflect.misc=javafx.base", ++ "--add-exports=java.base/sun.reflect.misc=javafx.graphics", ++ "--add-exports=java.base/sun.util.logging=javafx.graphics", ++ + '-h', "${project.buildDir}/gensrc/headers" + ]) + } +@@ -3005,6 +3058,15 @@ + test + } + ++ compileJava.options.compilerArgs.addAll([ ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.graphics", ++ "--add-exports=java.base/sun.util.logging=javafx.controls", ++ "--add-exports=java.base/sun.nio.ch=javafx.media", ++ "--add-exports=java.base/sun.reflect.misc=javafx.web", ++ "--add-exports=java.base/sun.reflect.misc=javafx.base" ++ ]) ++ + project.ext.moduleSourcePath = defaultModuleSourcePath + project.ext.moduleSourcePathShim = defaultModuleSourcePathShim + +@@ -3207,6 +3269,12 @@ + source = project.sourceSets.main.java.srcDirs + options.compilerArgs.addAll([ + '-implicit:none', ++ '--add-exports=java.base/sun.util.logging=javafx.base', ++ '--add-exports=java.base/sun.util.logging=javafx.graphics', ++ '--add-exports=java.base/sun.util.logging=javafx.controls', ++ '--add-exports=java.base/sun.nio.ch=javafx.media', ++ '--add-exports=java.base/sun.reflect.misc=javafx.web', ++ '--add-exports=java.base/sun.reflect.misc=javafx.base', + '--module-source-path', defaultModuleSourcePath + ]) + } +@@ -3463,7 +3531,17 @@ + project.compileShimsJava { + options.compilerArgs.addAll([ + '-implicit:none', +- '--module-source-path', project.moduleSourcePathShim ++ '--module-source-path', project.moduleSourcePathShim, ++ ++ "--add-exports=java.base/sun.util.logging=javafx.base", ++ "--add-exports=java.base/sun.util.logging=javafx.graphics", ++ "--add-exports=java.base/sun.util.logging=javafx.fxml", ++ "--add-exports=java.base/jdk.internal.misc=javafx.graphics", ++ "--add-exports=java.base/sun.util.logging=javafx.controls", ++ "--add-exports=java.base/sun.reflect.misc=javafx.base", ++ "--add-exports=java.base/sun.reflect.misc=javafx.web", ++ "--add-exports=java.base/sun.reflect.misc=javafx.fxml", ++ "--add-exports=java.base/sun.nio.ch=javafx.media" + ]) + } + project.compileShimsJava.dependsOn(project.compileJava) +@@ -3601,6 +3679,21 @@ + options.addBooleanOption("javafx").setValue(true); + options.addBooleanOption("use").setValue(true); + ++ options.addBooleanOption("-add-exports=java.base/sun.nio.ch=javafx.media").setValue(true); ++ options.addBooleanOption("-add-exports=java.base/sun.reflect.misc=javafx.base").setValue(true); ++ options.addBooleanOption("-add-exports=java.base/sun.reflect.misc=javafx.fxml").setValue(true); ++ options.addBooleanOption("-add-exports=java.base/sun.util.logging=javafx.base").setValue(true); ++ options.addBooleanOption("-add-exports=java.base/sun.util.logging=javafx.graphics").setValue(true); ++ options.addBooleanOption("-add-exports=java.base/sun.util.logging=javafx.controls").setValue(true); ++ options.addBooleanOption("-add-exports=java.base/sun.util.logging=javafx.fxml").setValue(true); ++ options.addBooleanOption("-add-exports=java.base/sun.util.logging=javafx.swing").setValue(true); ++ options.addBooleanOption("-add-exports=java.desktop/sun.awt=javafx.swing").setValue(true); ++ options.addBooleanOption("-add-exports=java.desktop/sun.awt.dnd=javafx.swing").setValue(true); ++ options.addBooleanOption("-add-exports=java.desktop/java.awt.dnd.peer=javafx.swing").setValue(true); ++ options.addBooleanOption("-add-exports=java.desktop/sun.awt.image=javafx.swing").setValue(true); ++ options.addBooleanOption("-add-exports=java.desktop/sun.java2d=javafx.swing").setValue(true); ++ options.addBooleanOption("-add-exports=java.desktop/sun.swing=javafx.swing").setValue(true); ++ + options.setOptionFiles([ + new File(rootProject.buildDir,MODULESOURCEPATH) + ]); diff --git a/debian/patches/series b/debian/patches/series index 9d45798..699bc54 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ fix-arm32-build.patch 24-disable-buildSrc-tests.patch 25-webkit-debug-level.patch 26-disable-webkit-jit-for-armv4.patch +27-add-java9-exports.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx9.git _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits