[openjfx9] 05/11: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 11 23:05:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository openjfx9.
commit 5328809336d06799e73a5b657d612b01e321d5d5
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Oct 11 11:33:46 2017 +0200
Refreshed the patches
---
debian/changelog | 1 +
debian/patches/01-skip-verify-java.patch | 4 +-
debian/patches/02-use-system-libraries.patch | 44 ++++++--------
debian/patches/03-buildflags.patch | 42 ++++++-------
debian/patches/05-set-antlr-timeout.patch | 2 +-
.../06-disable-architecture-verification.patch | 14 ++---
...07-disable-assembler-on-unsupported-archs.patch | 4 +-
debian/patches/08-disable-sse2.patch | 38 ++++++------
.../09-fix-conflicting-uchar32-typedef.patch | 4 +-
debian/patches/10-javadoc-locale.patch | 10 +---
debian/patches/11-icu-dynamic-linking.patch | 4 +-
debian/patches/15-fix-javadoc-refererences.diff | 10 ++--
.../patches/16-reproducible-build-timestamp.patch | 22 ++++---
debian/patches/17-gcc-compatibility.patch | 10 ++--
.../19-disable-webkit-sampling-profiler.patch | 4 +-
debian/patches/20-fix-ppc-build.patch | 4 +-
debian/patches/21-gcc7-compatibility.patch | 32 +++++-----
...2-JDK-8185792-accented-characters-support.patch | 8 +--
debian/patches/23-webcore-linker-flags.patch | 4 +-
debian/patches/24-disable-buildSrc-tests.patch | 2 +-
debian/patches/25-webkit-debug-level.patch | 4 +-
.../patches/26-disable-webkit-jit-for-armv4.patch | 4 +-
debian/patches/fix-arm32-build.patch | 68 +++++++++-------------
debian/patches/fix-arm64-build.patch | 8 +--
24 files changed, 161 insertions(+), 186 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ee3a71e..f519222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openjfx9 (9~b181-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
+ - Refreshed the patches
- Renamed the package to openjfx9
- Depend on openjdk-9 instead of openjdk-8
- Updated the watch file to track the Java 9 releases
diff --git a/debian/patches/01-skip-verify-java.patch b/debian/patches/01-skip-verify-java.patch
index 20a9422..ad08569 100644
--- a/debian/patches/01-skip-verify-java.patch
+++ b/debian/patches/01-skip-verify-java.patch
@@ -3,10 +3,10 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1059,7 +1059,7 @@
+@@ -1372,7 +1372,7 @@
def buildNum = Integer.parseInt(jdkBuildNumber)
def minBuildNum = Integer.parseInt(jfxBuildJdkBuildnumMin)
- if (buildNum < minBuildNum) {
+ if (buildNum != 0 && buildNum < minBuildNum) {
- fail("JDK build number ($buildNum) < minimum build number ($minBuildNum)")
+ //fail("JDK build number ($buildNum) < minimum build number ($minBuildNum)")
}
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index c8ecc90..95330bb 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -3,32 +3,25 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- a/build.gradle
+++ b/build.gradle
-@@ -1299,7 +1299,7 @@
+@@ -2109,7 +2109,7 @@
+ commonModuleSetup(project, [ 'base', 'graphics' ])
dependencies {
- compile project(":base"), BUILD_SRC
- compile name: SWT_FILE_NAME
+ compile files("/usr/share/java/swt4.jar")
- 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 @@
}
- dependencies {
- compile BUILD_SRC, project(":base"), project(":graphics")
-- compile name: SWT_FILE_NAME
-+ compile files("/usr/share/java/swt4.jar")
- }
- }
-@@ -2043,13 +2043,13 @@
+ classes << {
+@@ -2559,7 +2559,7 @@
classes << {
// Copy all of the download libraries to libs directory for the sake of the IDEs
File libsDir = rootProject.file("build/libs");
- File antLib = new File(libsDir, "ant-1.8.2.jar")
+ File antLib = new File(libsDir, "ant-debian.jar")
libsDir.mkdirs();
- for (File f : configurations.compile.files) {
+
+ // Skip copy if file is present.
+@@ -2569,7 +2569,7 @@
copy {
into libsDir
from f.getParentFile()
@@ -37,22 +30,21 @@ Forwarded: not-needed
includeEmptyDirs = false
}
}
-@@ -2533,13 +2533,13 @@
+@@ -3091,12 +3091,13 @@
+ outputs.dir("$webkitOutputDir/$webkitConfig/DerivedSources/WebCore/nativeJava/java")
- def compileNativeTask = task("compileNative${t.capital}", dependsOn: generateHeaders) << {
- println "Building Webkit configuration /$webkitConfig/ into $webkitOutputDir"
--
+ doLast {
+/*
- def dependencyFile = configurations.webkit.filter(
- { File f -> f.getName().contains(classifier) }
- ).getSingleFile()
- ant.unzip(src: dependencyFile,
- dest: webkitOutputDir)
+ def dependencyFile = configurations.webkit.filter(
+ { File f -> f.getName().contains(classifier) }
+ ).getSingleFile()
+ ant.unzip(src: dependencyFile,
+ dest: webkitOutputDir)
-
+*/
- exec {
- workingDir("$projectDir/src/main/native")
- commandLine("perl", "Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
+ exec {
+ workingDir("$projectDir/src/main/native")
+ commandLine("perl", "Tools/Scripts/set-webkit-configuration", "--$webkitConfig")
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -82,6 +82,7 @@
diff --git a/debian/patches/03-buildflags.patch b/debian/patches/03-buildflags.patch
index 4cb0d52..3ca5d42 100644
--- a/debian/patches/03-buildflags.patch
+++ b/debian/patches/03-buildflags.patch
@@ -5,7 +5,7 @@ Forwarded: no
+++ b/buildSrc/linux.gradle
@@ -45,6 +45,9 @@
"-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
- "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
+ "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
+commonFlags.addAll("dpkg-buildflags --get CPPFLAGS ".execute().text.trim().split(" "))
+commonFlags.addAll("dpkg-buildflags --get CXXFLAGS".execute().text.trim().split(" "))
@@ -13,27 +13,27 @@ Forwarded: no
if (!IS_64) {
commonFlags += "-m32"
}
-@@ -54,7 +57,10 @@
- commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
+@@ -55,7 +58,10 @@
IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
+ def ccFlagsGTK3 = ccFlags
//ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
+ccFlags.addAll("dpkg-buildflags --get CPPFLAGS ".execute().text.trim().split(" "))
+ccFlags.addAll("dpkg-buildflags --get CXXFLAGS".execute().text.trim().split(" "))
def linkFlags = ["-shared", commonFlags].flatten()
+linkFlags.addAll("dpkg-buildflags --get LDFLAGS".execute().text.trim().split(" "))
- // Create $buildDir/linux_tools.properties file and load props from it
- setupTools("linux_tools",
-@@ -180,7 +186,7 @@
+ if (IS_DEBUG_NATIVE) {
+ linkFlags += "-g"
+@@ -250,7 +256,7 @@
LINUX.launcherlibrary = [:]
LINUX.launcherlibrary.compiler = compiler
--LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC"]
-+LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98"]
+-LINUX.launcherlibrary.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC"]
++LINUX.launcherlibrary.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98"]
LINUX.launcherlibrary.linker = linker
LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"]
if (!IS_64) {
-@@ -196,7 +202,7 @@
+@@ -265,7 +271,7 @@
LINUX.iio.compiler = compiler
LINUX.iio.ccFlags = [ccFlags].flatten()
LINUX.iio.linker = linker
@@ -42,9 +42,9 @@ Forwarded: no
LINUX.iio.lib = "javafx_iio"
LINUX.prismES2 = [:]
---- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -26,11 +26,9 @@
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+@@ -29,11 +29,9 @@
-DGST_DISABLE_LOADSAVE \
-DGSTREAMER_LITE
@@ -59,9 +59,9 @@ Forwarded: no
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
---- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -27,12 +27,9 @@
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+@@ -30,12 +30,9 @@
-DGST_DISABLE_GST_DEBUG \
-DGSTREAMER_LITE
@@ -77,9 +77,9 @@ Forwarded: no
INCLUDES = -I$(SRCBASE_DIR) \
$(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
---- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-@@ -48,11 +48,9 @@
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+@@ -51,11 +51,9 @@
-DGST_DISABLE_GST_DEBUG \
-DGST_DISABLE_LOADSAVE
@@ -94,9 +94,9 @@ Forwarded: no
INCLUDES = -I$(BASE_DIR)/plugins \
-I$(SRCBASE_DIR)/projects/build/linux/common \
---- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -59,11 +59,9 @@
+--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+@@ -62,11 +62,9 @@
LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
endif
diff --git a/debian/patches/05-set-antlr-timeout.patch b/debian/patches/05-set-antlr-timeout.patch
index 03f5107..f84dfe3 100644
--- a/debian/patches/05-set-antlr-timeout.patch
+++ b/debian/patches/05-set-antlr-timeout.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
-@@ -115,7 +115,7 @@
+@@ -114,7 +114,7 @@
def grammars = fileTree(src).include("**/*.g")
main = "org.antlr.Tool"
classpath = configurations.antlr3
diff --git a/debian/patches/06-disable-architecture-verification.patch b/debian/patches/06-disable-architecture-verification.patch
index d10e628..b49c0ea 100644
--- a/debian/patches/06-disable-architecture-verification.patch
+++ b/debian/patches/06-disable-architecture-verification.patch
@@ -3,19 +3,19 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -699,6 +699,7 @@
+@@ -281,6 +281,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.
+/*
- if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
+ if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) fail("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 @@
+ fail("Unknown and unsupported build architecture: $OS_ARCH")
+@@ -289,6 +290,7 @@
} else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
- throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
+ fail("Unknown and unsupported build architecture: $OS_ARCH")
}
+*/
- // Sanity check that we actually have a list of compile targets to execute
- if (COMPILE_TARGETS == null || COMPILE_TARGETS == "") {
+
+ // Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
diff --git a/debian/patches/07-disable-assembler-on-unsupported-archs.patch b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
index 5a83289..6198aac 100644
--- a/debian/patches/07-disable-assembler-on-unsupported-archs.patch
+++ b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
@@ -1,8 +1,8 @@
Description: Disable assembler in WebKit on unsupported architectures
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
@@ -352,6 +352,12 @@
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
#endif
diff --git a/debian/patches/08-disable-sse2.patch b/debian/patches/08-disable-sse2.patch
index ece17e7..2ce459a 100644
--- a/debian/patches/08-disable-sse2.patch
+++ b/debian/patches/08-disable-sse2.patch
@@ -1,17 +1,17 @@
Description: Enable SSE2 on i386 and amd64 CPUs only
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -19,7 +19,6 @@
-
- CFLAGS = -fPIC \
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+@@ -22,7 +22,6 @@
+ -Wextra \
+ -Wformat-security \
-Werror=implicit-function-declaration \
- -msse2 \
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
-@@ -30,6 +29,11 @@
+@@ -33,6 +32,11 @@
CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall
LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
@@ -23,17 +23,17 @@ Forwarded: no
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
---- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -16,7 +16,6 @@
-
- CFLAGS = -fPIC \
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+@@ -19,7 +19,6 @@
+ -Wextra \
+ -Wformat-security \
-Werror=implicit-function-declaration \
- -msse2 \
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
-@@ -31,6 +30,11 @@
+@@ -34,6 +33,11 @@
CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall
LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
@@ -45,11 +45,11 @@ Forwarded: no
INCLUDES = -I$(SRCBASE_DIR) \
$(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
-I../../../gstreamer-lite/gstreamer \
---- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -38,9 +38,13 @@
-
- CFLAGS += -fPIC \
+--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+@@ -41,9 +41,13 @@
+ -Wextra \
+ -Wformat-security \
-Werror=implicit-function-declaration \
- -msse2 \
-DGSTREAMER_LITE
@@ -62,8 +62,8 @@ Forwarded: no
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
---- a/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
-+++ b/modules/web/src/main/native/Tools/Scripts/webkitdirs.pm
+--- a/modules/javafx.web/src/main/native/Tools/Scripts/webkitdirs.pm
++++ b/modules/javafx.web/src/main/native/Tools/Scripts/webkitdirs.pm
@@ -2037,7 +2037,7 @@
# Compiler options to keep floating point values consistent
# between 32-bit and 64-bit architectures.
diff --git a/debian/patches/09-fix-conflicting-uchar32-typedef.patch b/debian/patches/09-fix-conflicting-uchar32-typedef.patch
index d6c812d..1b57e29 100644
--- a/debian/patches/09-fix-conflicting-uchar32-typedef.patch
+++ b/debian/patches/09-fix-conflicting-uchar32-typedef.patch
@@ -1,8 +1,8 @@
Description: Fix a type definition conflict for UChar32
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- a/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/unicode/java/UnicodeJava.h
@@ -26,7 +26,7 @@
// #endif
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index c5db904..66b06c4 100644
--- a/debian/patches/10-javadoc-locale.patch
+++ b/debian/patches/10-javadoc-locale.patch
@@ -3,15 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -1218,6 +1218,7 @@
- } else {
- options.links(JDK_DOCS);
- }
-+ options.locale("en");
- options.addBooleanOption("XDignore.symbol.file").setValue(true);
- options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
- options.addBooleanOption("javafx").setValue(true);
-@@ -2751,6 +2752,7 @@
+@@ -3589,6 +3589,7 @@
options.windowTitle("${javadocTitle}")
options.header("${javadocHeader}")
options.bottom("${javadocBottom}")
diff --git a/debian/patches/11-icu-dynamic-linking.patch b/debian/patches/11-icu-dynamic-linking.patch
index e899a05..ea6141d 100644
--- a/debian/patches/11-icu-dynamic-linking.patch
+++ b/debian/patches/11-icu-dynamic-linking.patch
@@ -1,8 +1,8 @@
Description: Dynamic linking against ICU
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
---- a/modules/web/src/main/native/Source/WebCore/TargetJava.pri
-+++ b/modules/web/src/main/native/Source/WebCore/TargetJava.pri
+--- a/modules/javafx.web/src/main/native/Source/WebCore/TargetJava.pri
++++ b/modules/javafx.web/src/main/native/Source/WebCore/TargetJava.pri
@@ -229,9 +229,9 @@
# just for build debug: force verboce output from linker
QMAKE_LFLAGS += -Wl,--verbose
diff --git a/debian/patches/15-fix-javadoc-refererences.diff b/debian/patches/15-fix-javadoc-refererences.diff
index 5138ae7..9b0a438 100644
--- a/debian/patches/15-fix-javadoc-refererences.diff
+++ b/debian/patches/15-fix-javadoc-refererences.diff
@@ -1,13 +1,11 @@
-Index: b/build.gradle
-===================================================================
--- a/build.gradle
+++ b/build.gradle
-@@ -275,7 +275,7 @@ defineProperty("JAVA", cygpath("$JDK_HOM
+@@ -317,7 +317,7 @@
defineProperty("JAVAC", cygpath("$JDK_HOME/bin/javac${IS_WINDOWS ? '.exe' : ''}"))
defineProperty("JAVAH", cygpath("$JDK_HOME/bin/javah${IS_WINDOWS ? '.exe' : ''}"))
defineProperty("JAVADOC", cygpath("$JDK_HOME/bin/javadoc${IS_WINDOWS ? '.exe' : ''}"))
--defineProperty("JDK_DOCS", "https://docs.oracle.com/javase/8/docs/api/")
-+defineProperty("JDK_DOCS", "file:///usr/share/doc/openjdk-8-doc/api/")
+-defineProperty("JDK_DOCS", "http://download.java.net/java/jdk9/docs/api/")
++defineProperty("JDK_DOCS", "file:///usr/share/doc/openjdk-9-doc/api/")
+ defineProperty("JDK_JMODS", cygpath(System.getenv("JDK_JMODS")) ?: cygpath(System.getenv("JDK_HOME") + "/jmods"))
defineProperty("javaRuntimeVersion", System.getProperty("java.runtime.version"))
- defineProperty("javaVersion", javaRuntimeVersion.split("-")[0])
diff --git a/debian/patches/16-reproducible-build-timestamp.patch b/debian/patches/16-reproducible-build-timestamp.patch
index 2106565..85d637c 100644
--- a/debian/patches/16-reproducible-build-timestamp.patch
+++ b/debian/patches/16-reproducible-build-timestamp.patch
@@ -3,12 +3,16 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/build.gradle
+++ b/build.gradle
-@@ -1245,7 +1245,7 @@
- // We need to take the VersionInfo.java file and replace the various
- // properties within it
- def replacements = [
-- "BUILD_TIMESTAMP": new java.util.Date(),
-+ "BUILD_TIMESTAMP": new java.util.Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))),
- "HUDSON_JOB_NAME": HUDSON_JOB_NAME,
- "HUDSON_BUILD_NUMBER": HUDSON_BUILD_NUMBER,
- "PROMOTED_BUILD_NUMBER": PROMOTED_BUILD_NUMBER,
+@@ -521,8 +521,10 @@
+ defineProperty("RELEASE_VERSION", relVer)
+ defineProperty("RELEASE_VERSION_PADDED", "${jfxReleaseMajorVersion}.${jfxReleaseMinorVersion}.${jfxReleaseSecurityVersion}.${jfxReleasePatchVersion}")
+
+-def buildDate = new java.util.Date()
+-def buildTimestamp = new java.text.SimpleDateFormat("yyyy-MM-dd-HHmmss").format(buildDate)
++def buildDate = new java.util.Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))
++def dateFormat = new java.text.SimpleDateFormat("yyyy-MM-dd-HHmmss")
++dateFormat.setTimeZone(java.util.TimeZone.getTimeZone("UTC"))
++def buildTimestamp = dateFormat.format(buildDate)
+ defineProperty("BUILD_TIMESTAMP", buildTimestamp)
+ def relSuffix = ""
+ def relOpt = ""
diff --git a/debian/patches/17-gcc-compatibility.patch b/debian/patches/17-gcc-compatibility.patch
index 8001537..39bcdde 100644
--- a/debian/patches/17-gcc-compatibility.patch
+++ b/debian/patches/17-gcc-compatibility.patch
@@ -2,11 +2,9 @@ Description: Fixes a build error with GCC 6
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
Bug-Debian: https://bugs.debian.org/837021
-diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
-index 5c8f4b9..7c35213 100644
---- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
-+++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
-@@ -46,6 +46,7 @@
+--- a/modules/jdk.packager/src/main/native/library/common/PosixPlatform.cpp
++++ b/modules/jdk.packager/src/main/native/library/common/PosixPlatform.cpp
+@@ -47,6 +47,7 @@
#include <iostream>
#include <dlfcn.h>
#include <signal.h>
@@ -14,7 +12,7 @@ index 5c8f4b9..7c35213 100644
PosixPlatform::PosixPlatform(void) {
-@@ -232,7 +233,7 @@ bool PosixProcess::Wait() {
+@@ -313,7 +314,7 @@
//TODO Use waitpid instead of wait
#ifdef LINUX
diff --git a/debian/patches/19-disable-webkit-sampling-profiler.patch b/debian/patches/19-disable-webkit-sampling-profiler.patch
index d711bd8..1ce80c1 100644
--- a/debian/patches/19-disable-webkit-sampling-profiler.patch
+++ b/debian/patches/19-disable-webkit-sampling-profiler.patch
@@ -1,8 +1,8 @@
Description: Disables the sampling profiler in WebKit (fails to build on arm64)
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
---- a/modules/web/src/main/native/Source/cmake/WebKitFeatures.cmake
-+++ b/modules/web/src/main/native/Source/cmake/WebKitFeatures.cmake
+--- a/modules/javafx.web/src/main/native/Source/cmake/WebKitFeatures.cmake
++++ b/modules/javafx.web/src/main/native/Source/cmake/WebKitFeatures.cmake
@@ -171,7 +171,7 @@
WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_TIMING "Toggle Resource Timing support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_USAGE "Toggle resource usage support" PRIVATE OFF)
diff --git a/debian/patches/20-fix-ppc-build.patch b/debian/patches/20-fix-ppc-build.patch
index 9884f73..fbc012b 100644
--- a/debian/patches/20-fix-ppc-build.patch
+++ b/debian/patches/20-fix-ppc-build.patch
@@ -1,8 +1,8 @@
Description: Fixes a build failure on ppc
Origin: backport, http://trac.webkit.org/changeset/198919/webkit
Bug: https://bugs.webkit.org/show_bug.cgi?id=156015
---- a/modules/web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ b/modules/web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
+--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -86,7 +86,11 @@
}
diff --git a/debian/patches/21-gcc7-compatibility.patch b/debian/patches/21-gcc7-compatibility.patch
index 59c911c..a261d3b 100644
--- a/debian/patches/21-gcc7-compatibility.patch
+++ b/debian/patches/21-gcc7-compatibility.patch
@@ -2,8 +2,8 @@ Description: Fixes the compilation errors with GCC 7
Origin: backport, http://trac.webkit.org/changeset/217601/webkit
http://trac.webkit.org/changeset/211434/webkit
http://trac.webkit.org/changeset/218488/webkit
---- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-+++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
+--- a/modules/javafx.web/src/main/native/Source/cmake/OptionsCommon.cmake
++++ b/modules/javafx.web/src/main/native/Source/cmake/OptionsCommon.cmake
@@ -26,8 +26,10 @@
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -15,8 +15,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing -fno-rtti")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif ()
---- a/modules/web/src/main/native/Source/JavaScriptCore/runtime/JSArrayBufferView.h
-+++ b/modules/web/src/main/native/Source/JavaScriptCore/runtime/JSArrayBufferView.h
+--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/JSArrayBufferView.h
++++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/runtime/JSArrayBufferView.h
@@ -162,7 +162,7 @@
bool isNeutered() { return hasArrayBuffer() && !vector(); }
void neuter();
@@ -26,8 +26,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
{
return m_vector.getPredicated(
this,
---- a/modules/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
-+++ b/modules/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
+--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
++++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
@@ -29,6 +29,7 @@
#include "InspectorFrontendRouter.h"
@@ -36,8 +36,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
#include <wtf/Optional.h>
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
---- a/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
-+++ b/modules/web/src/main/native/Source/WebCore/css/CSSValue.h
+--- a/modules/javafx.web/src/main/native/Source/WebCore/css/CSSValue.h
++++ b/modules/javafx.web/src/main/native/Source/WebCore/css/CSSValue.h
@@ -23,6 +23,7 @@
#include "ExceptionCode.h"
@@ -46,8 +46,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
#include <wtf/ListHashSet.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
---- a/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
-+++ b/modules/web/src/main/native/Source/WebCore/css/StyleSheetContents.h
+--- a/modules/javafx.web/src/main/native/Source/WebCore/css/StyleSheetContents.h
++++ b/modules/javafx.web/src/main/native/Source/WebCore/css/StyleSheetContents.h
@@ -24,6 +24,7 @@
#include "CSSParserMode.h"
#include "CachePolicy.h"
@@ -56,8 +56,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
#include <wtf/HashMap.h>
#include <wtf/ListHashSet.h>
#include <wtf/RefCounted.h>
---- a/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
-+++ b/modules/web/src/main/native/Source/WebCore/dom/SlotAssignment.h
+--- a/modules/javafx.web/src/main/native/Source/WebCore/dom/SlotAssignment.h
++++ b/modules/javafx.web/src/main/native/Source/WebCore/dom/SlotAssignment.h
@@ -28,6 +28,7 @@
#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
@@ -66,8 +66,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.h>
---- a/modules/web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
-+++ b/modules/web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
+--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
++++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/NetscapePlugInStreamLoader.h
@@ -30,6 +30,7 @@
#define NetscapePlugInStreamLoader_h
@@ -76,8 +76,8 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
#include <wtf/Forward.h>
namespace WebCore {
---- a/modules/web/src/main/native/Source/WebCore/loader/ResourceLoader.h
-+++ b/modules/web/src/main/native/Source/WebCore/loader/ResourceLoader.h
+--- a/modules/javafx.web/src/main/native/Source/WebCore/loader/ResourceLoader.h
++++ b/modules/javafx.web/src/main/native/Source/WebCore/loader/ResourceLoader.h
@@ -34,6 +34,7 @@
#include "ResourceLoaderTypes.h"
#include "ResourceRequest.h"
diff --git a/debian/patches/22-JDK-8185792-accented-characters-support.patch b/debian/patches/22-JDK-8185792-accented-characters-support.patch
index 7f1aeda..0a9197e 100644
--- a/debian/patches/22-JDK-8185792-accented-characters-support.patch
+++ b/debian/patches/22-JDK-8185792-accented-characters-support.patch
@@ -2,9 +2,9 @@ Description: JDK-8185792: Entering accents in a textfield on a JFXPanel produces
Origin: backport, http://hg.openjdk.java.net/openjfx/10-dev/rt/rev/ef0ec553083f
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 @@
+--- a/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java
++++ b/modules/javafx.swing/src/main/java/javafx/embed/swing/JFXPanel.java
+@@ -707,11 +707,15 @@
private void sendInputMethodEventToFX(InputMethodEvent e) {
String t = InputMethodSupport.getTextForEvent(e);
@@ -20,4 +20,4 @@ Bug-Debian: https://bugs.debian.org/872619
+ insertionIndex);
}
-
+ /**
diff --git a/debian/patches/23-webcore-linker-flags.patch b/debian/patches/23-webcore-linker-flags.patch
index a25631c..5942b40 100644
--- a/debian/patches/23-webcore-linker-flags.patch
+++ b/debian/patches/23-webcore-linker-flags.patch
@@ -2,8 +2,8 @@ Descrition: Use the gold linker with memory saving options to avoid build failur
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
Bug-Debian: https://bugs.debian.org/857464
---- a/modules/web/src/main/native/Source/WebCore/CMakeLists.txt
-+++ b/modules/web/src/main/native/Source/WebCore/CMakeLists.txt
+--- a/modules/javafx.web/src/main/native/Source/WebCore/CMakeLists.txt
++++ b/modules/javafx.web/src/main/native/Source/WebCore/CMakeLists.txt
@@ -3809,7 +3809,7 @@
if (APPLE)
set_target_properties(WebCore PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
diff --git a/debian/patches/24-disable-buildSrc-tests.patch b/debian/patches/24-disable-buildSrc-tests.patch
index 65c8643..b438be7 100644
--- a/debian/patches/24-disable-buildSrc-tests.patch
+++ b/debian/patches/24-disable-buildSrc-tests.patch
@@ -8,6 +8,6 @@ Forwarded: not-needed
// we start building with Java 9.
test {
+ enabled = false;
- jvmArgs("-Djava.ext.dirs=");
enableAssertions = true;
testLogging.exceptionFormat = "full";
+ scanForTestClasses = false;
diff --git a/debian/patches/25-webkit-debug-level.patch b/debian/patches/25-webkit-debug-level.patch
index a2e9f1e..bb164bd 100644
--- a/debian/patches/25-webkit-debug-level.patch
+++ b/debian/patches/25-webkit-debug-level.patch
@@ -2,8 +2,8 @@ Description: Use the -g1 debugging level instead of -g when compiling WebKit
to reduce the memory used and avoid build failures caused by lack of RAM.
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
---- a/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
-+++ b/modules/web/src/main/native/Source/cmake/OptionsCommon.cmake
+--- a/modules/javafx.web/src/main/native/Source/cmake/OptionsCommon.cmake
++++ b/modules/javafx.web/src/main/native/Source/cmake/OptionsCommon.cmake
@@ -32,6 +32,8 @@
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing -fno-rtti")
diff --git a/debian/patches/26-disable-webkit-jit-for-armv4.patch b/debian/patches/26-disable-webkit-jit-for-armv4.patch
index 7c28b90..2b2528a 100644
--- a/debian/patches/26-disable-webkit-jit-for-armv4.patch
+++ b/debian/patches/26-disable-webkit-jit-for-armv4.patch
@@ -1,8 +1,8 @@
Description: Disables the WebKit JIT on armel (fails to build)
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
---- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
@@ -759,6 +759,11 @@
#define ENABLE_JIT 1
#endif
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
index 5db86bd..5dee8d3 100644
--- a/debian/patches/fix-arm32-build.patch
+++ b/debian/patches/fix-arm32-build.patch
@@ -1,8 +1,6 @@
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-===================================================================
---- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
-@@ -55,11 +55,6 @@ INCLUDES += $(shell pkg-config --cflags
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+@@ -58,11 +58,6 @@
LDFLAGS += $(shell pkg-config --libs libavcodec libavformat)
endif
@@ -14,11 +12,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefil
SOURCES = av/fxavcodecplugin.c \
av/avelement.c \
av/decoder.c \
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-===================================================================
---- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
-@@ -45,11 +45,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+@@ -48,11 +48,6 @@
LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS)
@@ -30,11 +26,9 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefi
SOURCES = fxplugins.c \
progressbuffer/progressbuffer.c \
progressbuffer/hlsprogressbuffer.c \
-Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-===================================================================
---- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
-@@ -70,11 +70,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
+--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
++++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+@@ -73,11 +73,6 @@
LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS)
@@ -44,13 +38,11 @@ Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/M
-endif
-
SOURCES = \
- gstreamer/gst/gst.c \
- gstreamer/gst/gstbin.c \
-Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-===================================================================
---- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
-@@ -67,11 +67,6 @@ CFLAGS += $(shell dpkg-buildflags --get
+ gstreamer/gst/gst.c \
+ gstreamer/gst/gstallocator.c \
+--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
++++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+@@ -70,11 +70,6 @@
CFLAGS += $(shell dpkg-buildflags --get CFLAGS) -Wall
LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
@@ -62,11 +54,9 @@ Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
CPP_SOURCES = \
jni/com_sun_media_jfxmedia_logging_Logger.cpp \
jni/JavaBandsHolder.cpp \
-Index: b/buildSrc/linux.gradle
-===================================================================
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
-@@ -48,10 +48,6 @@ def commonFlags = [
+@@ -48,10 +48,6 @@
commonFlags.addAll("dpkg-buildflags --get CPPFLAGS ".execute().text.trim().split(" "))
commonFlags.addAll("dpkg-buildflags --get CXXFLAGS".execute().text.trim().split(" "))
@@ -77,8 +67,8 @@ Index: b/buildSrc/linux.gradle
// Specify the compilation parameters and link parameters
def ccFlags = [
commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
-@@ -179,20 +175,12 @@ LINUX.launcher.compiler = compiler
- LINUX.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
+@@ -249,20 +245,12 @@
+ LINUX.launcher.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
LINUX.launcher.linker = linker
LINUX.launcher.linkFlags = ["-ldl"]
-if (!IS_64) {
@@ -88,7 +78,7 @@ Index: b/buildSrc/linux.gradle
LINUX.launcherlibrary = [:]
LINUX.launcherlibrary.compiler = compiler
- LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98"]
+ LINUX.launcherlibrary.ccFlags = ["-Wextra", "-Wformat", "-Wformat-security", "-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC", "-std=gnu++98"]
LINUX.launcherlibrary.linker = linker
LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared"]
-if (!IS_64) {
@@ -97,16 +87,16 @@ Index: b/buildSrc/linux.gradle
-}
LINUX.iio = [:]
- LINUX.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
+ LINUX.iio.nativeSource = [
--- a/build.gradle
+++ b/build.gradle
-@@ -2568,9 +2568,6 @@
- } else if (t.name == "mac") {
- // Add any osx specific flags.
- } else if (t.name == "linux") {
-- if (!IS_64) {
-- cmakeArgs = "-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
-- }
- } else if (t.name.startsWith("arm")) {
- fail("ARM target is not supported as of now.")
- }
+@@ -3125,9 +3125,6 @@
+ } else if (t.name == "mac") {
+ // Add any osx specific flags.
+ } else if (t.name == "linux") {
+- if (!IS_64) {
+- cmakeArgs = "-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
+- }
+ } else if (t.name.startsWith("arm")) {
+ fail("ARM target is not supported as of now.")
+ }
diff --git a/debian/patches/fix-arm64-build.patch b/debian/patches/fix-arm64-build.patch
index bc17b35..5b2707d 100644
--- a/debian/patches/fix-arm64-build.patch
+++ b/debian/patches/fix-arm64-build.patch
@@ -5,8 +5,8 @@ Description: Fix arm64 build
Fix some other areas where disabling JIT doesn't work.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
Forwarded: no
---- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
+--- a/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
++++ b/modules/javafx.web/src/main/native/Source/WTF/wtf/Platform.h
@@ -179,6 +179,9 @@
/* CPU(ARM64) - Apple */
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
@@ -17,8 +17,8 @@ Forwarded: no
#endif
/* CPU(ARM) - ARM, any version*/
---- a/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
-+++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
+--- a/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
++++ b/modules/javafx.web/src/main/native/Source/WebCore/platform/graphics/transforms/TransformationMatrix.cpp
@@ -1035,7 +1035,7 @@
// this = mat * this.
TransformationMatrix& TransformationMatrix::multiply(const TransformationMatrix& mat)
--
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