[openjfx] 02/05: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 4 22:19:54 UTC 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx.
commit fd1d395bbb7864f6f8ee347d416a9e818f43c8a8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 4 19:32:12 2018 +0200
Refreshed the patches
---
debian/changelog | 8 ++++++++
debian/patches/01-skip-verify-java.patch | 2 +-
debian/patches/02-use-system-libraries.patch | 6 +++---
debian/patches/06-disable-architecture-verification.patch | 4 ++--
debian/patches/10-javadoc-locale.patch | 4 ++--
debian/patches/16-reproducible-build-timestamp.patch | 2 +-
debian/patches/22-JDK-8185792-accented-characters-support.patch | 2 +-
debian/patches/fix-arm32-build.patch | 2 +-
8 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 570bd91..dc90b8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openjfx (8u161-b12-1) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * New upstream release:
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 04 Apr 2018 19:31:44 +0200
+
openjfx (8u151-b12-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/01-skip-verify-java.patch b/debian/patches/01-skip-verify-java.patch
index 20a9422..04589b9 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
-@@ -1059,7 +1059,7 @@
+@@ -1066,7 +1066,7 @@
def buildNum = Integer.parseInt(jdkBuildNumber)
def minBuildNum = Integer.parseInt(jfxBuildJdkBuildnumMin)
if (buildNum < minBuildNum) {
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 3293294..10794b9 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
-@@ -1299,7 +1299,7 @@
+@@ -1306,7 +1306,7 @@
dependencies {
compile project(":base"), BUILD_SRC
@@ -12,7 +12,7 @@ Forwarded: not-needed
stubCompile group: "junit", name: "junit", version: "4.8.2",
project(":base").sourceSets.test.output, sourceSets.main.output
antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
-@@ -1680,7 +1680,7 @@
+@@ -1687,7 +1687,7 @@
}
dependencies {
compile BUILD_SRC, project(":base"), project(":graphics")
@@ -21,7 +21,7 @@ Forwarded: not-needed
}
}
-@@ -2043,13 +2043,13 @@
+@@ -2050,13 +2050,13 @@
classes << {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
diff --git a/debian/patches/06-disable-architecture-verification.patch b/debian/patches/06-disable-architecture-verification.patch
index d10e628..8c71742 100644
--- a/debian/patches/06-disable-architecture-verification.patch
+++ b/debian/patches/06-disable-architecture-verification.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -699,6 +699,7 @@
+@@ -706,6 +706,7 @@
// at present building on PI is not supported, but we would only need to make
// some changes on assumptions on what should be built (like SWT / Swing) and
// such and we could probably make it work.
@@ -11,7 +11,7 @@ Forwarded: no
if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
-@@ -707,6 +708,7 @@
+@@ -714,6 +715,7 @@
} else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
}
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index 30daf97..c12859c 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
-@@ -1218,6 +1218,7 @@
+@@ -1225,6 +1225,7 @@
} else {
options.links(JDK_DOCS);
}
@@ -11,7 +11,7 @@ Forwarded: no
options.addBooleanOption("XDignore.symbol.file").setValue(true);
options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
options.addBooleanOption("javafx").setValue(true);
-@@ -2724,6 +2725,7 @@
+@@ -2731,6 +2732,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 2106565..3ac6e3e 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
-@@ -1245,7 +1245,7 @@
+@@ -1252,7 +1252,7 @@
// We need to take the VersionInfo.java file and replace the various
// properties within it
def replacements = [
diff --git a/debian/patches/22-JDK-8185792-accented-characters-support.patch b/debian/patches/22-JDK-8185792-accented-characters-support.patch
index 7f1aeda..0aed9e5 100644
--- a/debian/patches/22-JDK-8185792-accented-characters-support.patch
+++ b/debian/patches/22-JDK-8185792-accented-characters-support.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.openjdk.java.net/browse/JDK-8185792
Bug-Debian: https://bugs.debian.org/872619
--- a/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
+++ b/modules/swing/src/main/java/javafx/embed/swing/JFXPanel.java
-@@ -640,11 +640,15 @@
+@@ -674,11 +674,15 @@
private void sendInputMethodEventToFX(InputMethodEvent e) {
String t = InputMethodSupport.getTextForEvent(e);
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
index 9f451fc..5d85b6d 100644
--- a/debian/patches/fix-arm32-build.patch
+++ b/debian/patches/fix-arm32-build.patch
@@ -90,7 +90,7 @@
LINUX.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
--- a/build.gradle
+++ b/build.gradle
-@@ -2556,9 +2556,6 @@
+@@ -2563,9 +2563,6 @@
// JFX WebKit needs atleast 10.9 OSX
cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -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/openjfx.git
More information about the pkg-java-commits
mailing list