[openjfx9] 05/05: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 4 11:41:02 UTC 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx9.
commit 60ec87a04f7cd183654ab11a3bd34f47b09096d1
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 4 13:04:10 2018 +0200
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/01-skip-verify-java.patch | 2 +-
debian/patches/02-use-system-libraries.patch | 8 ++++----
debian/patches/10-javadoc-locale.patch | 2 +-
.../patches/16-reproducible-build-timestamp.patch | 2 +-
debian/patches/27-add-java9-exports.patch | 22 +++++++++++-----------
debian/patches/28-adjust-classpath.patch | 12 ++++++------
debian/patches/fix-arm32-build.patch | 2 +-
8 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4bd0205..5f5d805 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openjfx9 (9~b181-1) UNRELEASED; urgency=medium
+openjfx9 (9.0.4+11-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
diff --git a/debian/patches/01-skip-verify-java.patch b/debian/patches/01-skip-verify-java.patch
index ad08569..9296c22 100644
--- a/debian/patches/01-skip-verify-java.patch
+++ b/debian/patches/01-skip-verify-java.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1372,7 +1372,7 @@
+@@ -1377,7 +1377,7 @@
def buildNum = Integer.parseInt(jdkBuildNumber)
def minBuildNum = Integer.parseInt(jfxBuildJdkBuildnumMin)
if (buildNum != 0 && buildNum < minBuildNum) {
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 71f5a83..c077eac 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1618,6 +1618,7 @@
+@@ -1623,6 +1623,7 @@
stubCompile group: "junit", name: "junit", version: "4.8.2"
antlr group: "org.antlr", name: "antlr-complete", version: "3.5.2"
@@ -11,7 +11,7 @@ Forwarded: not-needed
}
project.ext.moduleSourcePath = defaultModuleSourcePath_GraphicsOne
-@@ -2109,7 +2110,7 @@
+@@ -2114,7 +2115,7 @@
commonModuleSetup(project, [ 'base', 'graphics' ])
dependencies {
@@ -20,7 +20,7 @@ Forwarded: not-needed
}
classes << {
-@@ -2559,7 +2560,7 @@
+@@ -2564,7 +2565,7 @@
classes << {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
@@ -29,7 +29,7 @@ Forwarded: not-needed
libsDir.mkdirs();
// Skip copy if file is present.
-@@ -2569,7 +2570,7 @@
+@@ -2574,7 +2575,7 @@
copy {
into libsDir
from f.getParentFile()
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index 816cbd0..ddcf5c3 100644
--- a/debian/patches/10-javadoc-locale.patch
+++ b/debian/patches/10-javadoc-locale.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -3558,6 +3558,7 @@
+@@ -3563,6 +3563,7 @@
options.windowTitle("${javadocTitle}")
options.header("${javadocHeader}")
options.bottom("${javadocBottom}")
diff --git a/debian/patches/16-reproducible-build-timestamp.patch b/debian/patches/16-reproducible-build-timestamp.patch
index 85d637c..abdb873 100644
--- a/debian/patches/16-reproducible-build-timestamp.patch
+++ b/debian/patches/16-reproducible-build-timestamp.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -521,8 +521,10 @@
+@@ -523,8 +523,10 @@
defineProperty("RELEASE_VERSION", relVer)
defineProperty("RELEASE_VERSION_PADDED", "${jfxReleaseMajorVersion}.${jfxReleaseMinorVersion}.${jfxReleaseSecurityVersion}.${jfxReleasePatchVersion}")
diff --git a/debian/patches/27-add-java9-exports.patch b/debian/patches/27-add-java9-exports.patch
index 1d1c59f..3aa62e1 100644
--- a/debian/patches/27-add-java9-exports.patch
+++ b/debian/patches/27-add-java9-exports.patch
@@ -3,7 +3,7 @@ Author: Mario Ivankovits <mario at 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 @@
+@@ -1564,6 +1564,11 @@
commonModuleSetup(project, [ 'base' ])
@@ -15,7 +15,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
project.ext.moduleSourcePath = defaultModuleSourcePath
project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
-@@ -1609,6 +1614,13 @@
+@@ -1614,6 +1619,13 @@
getConfigurations().create("antlr");
@@ -29,7 +29,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
sourceSets {
jslc // JSLC gramar subset
main
-@@ -1705,6 +1717,10 @@
+@@ -1710,6 +1722,10 @@
options.compilerArgs.addAll([
'-h', "$buildDir/gensrc/headers/", // Note: this creates the native headers
'-implicit:none',
@@ -40,7 +40,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
'--module-source-path', defaultModuleSourcePath
] )
}
-@@ -2025,6 +2041,13 @@
+@@ -2030,6 +2046,13 @@
test
}
@@ -54,7 +54,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
project.ext.moduleSourcePath = defaultModuleSourcePath
project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
-@@ -2090,6 +2113,21 @@
+@@ -2095,6 +2118,21 @@
test
}
@@ -76,7 +76,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
project.ext.moduleSourcePath = defaultModuleSourcePath
project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
-@@ -2175,6 +2213,14 @@
+@@ -2180,6 +2218,14 @@
project.ext.moduleSourcePath = defaultModuleSourcePath
project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
@@ -91,7 +91,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
commonModuleSetup(project, [ 'base', 'graphics', 'swing', 'controls', 'fxml' ])
-@@ -2724,6 +2770,13 @@
+@@ -2729,6 +2775,13 @@
compileJava {
// generate the native headers during compile
options.compilerArgs.addAll([
@@ -105,7 +105,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
'-h', "${project.buildDir}/gensrc/headers"
])
}
-@@ -3005,6 +3058,15 @@
+@@ -3010,6 +3063,15 @@
test
}
@@ -121,7 +121,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
project.ext.moduleSourcePath = defaultModuleSourcePath
project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
-@@ -3175,6 +3237,12 @@
+@@ -3180,6 +3242,12 @@
source = project.sourceSets.main.java.srcDirs
options.compilerArgs.addAll([
'-implicit:none',
@@ -134,7 +134,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
'--module-source-path', defaultModuleSourcePath
])
}
-@@ -3431,7 +3499,17 @@
+@@ -3436,7 +3504,17 @@
project.compileShimsJava {
options.compilerArgs.addAll([
'-implicit:none',
@@ -153,7 +153,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
])
}
project.compileShimsJava.dependsOn(project.compileJava)
-@@ -3569,6 +3647,21 @@
+@@ -3574,6 +3652,21 @@
options.addBooleanOption("javafx").setValue(true);
options.addBooleanOption("use").setValue(true);
diff --git a/debian/patches/28-adjust-classpath.patch b/debian/patches/28-adjust-classpath.patch
index a56fdbf..4559845 100644
--- a/debian/patches/28-adjust-classpath.patch
+++ b/debian/patches/28-adjust-classpath.patch
@@ -3,7 +3,7 @@ Author: Mario Ivankovits <mario at datenwort.at>
Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/020883.html
--- a/build.gradle
+++ b/build.gradle
-@@ -1266,7 +1266,7 @@
+@@ -1271,7 +1271,7 @@
dependsOn: project.compileJava) {
description = "Compile the $name JSL Compilers"
@@ -12,7 +12,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
project.files(project.sourceSets.jslc.output.classesDir) +
project.configurations.antlr
source = [project.file("src/main/jsl-$lowerName")]
-@@ -1881,6 +1881,9 @@
+@@ -1886,6 +1886,9 @@
classpath += files("${project.projectDir}/src/jslc/resources")
@@ -22,7 +22,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
classpath += files("$buildDir/classes/main")
classpath += files("$buildDir/classes/jsl-compilers/decora")
jvmArgs += decoraAddExports
-@@ -2079,6 +2082,8 @@
+@@ -2084,6 +2087,8 @@
"$moduleDir/com/sun/javafx/scene/control/skin/modena/touch.css"].each { css ->
javaexec {
executable = JAVA
@@ -31,7 +31,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
workingDir = project.projectDir
jvmArgs += patchModuleArgs
main = "com.sun.javafx.css.parser.Css2Bin"
-@@ -2246,6 +2251,9 @@
+@@ -2251,6 +2256,9 @@
commonModuleSetup(project, [ 'base', 'graphics', 'swing', 'controls', 'media', 'jmx' ])
@@ -41,7 +41,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
dependencies {
}
-@@ -2787,6 +2795,7 @@
+@@ -2792,6 +2800,7 @@
options.compilerArgs.addAll([
'--add-exports', 'javafx.media/com.sun.media.jfxmedia=ALL-UNNAMED',
])
@@ -49,7 +49,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
}
project.ext.makeJobsFlag = IS_WINDOWS && IS_DEBUG_NATIVE ? "-j1" : "-j5";
-@@ -2809,7 +2818,7 @@
+@@ -2814,7 +2823,7 @@
commandLine("$JAVA");
args += patchModuleArgs
args += [ '--add-exports=javafx.media/com.sun.media.jfxmedia=ALL-UNNAMED' ]
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
index 0bedfc8..6ac7405 100644
--- a/debian/patches/fix-arm32-build.patch
+++ b/debian/patches/fix-arm32-build.patch
@@ -90,7 +90,7 @@
LINUX.iio.nativeSource = [
--- a/build.gradle
+++ b/build.gradle
-@@ -3108,9 +3108,6 @@
+@@ -3113,9 +3113,6 @@
} else if (t.name == "mac") {
cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
} else if (t.name == "linux") {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx9.git
More information about the pkg-java-commits
mailing list