[openjfx9] 03/05: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Apr 4 11:41:01 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 c03806d721c32f3f115aee2203717d0811a2b291
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Apr 4 12:56:59 2018 +0200
Refreshed the patches
---
debian/patches/02-use-system-libraries.patch | 15 -------
...07-disable-assembler-on-unsupported-archs.patch | 2 +-
debian/patches/08-disable-sse2.patch | 11 -----
debian/patches/10-javadoc-locale.patch | 2 +-
.../19-disable-webkit-sampling-profiler.patch | 8 ++--
debian/patches/20-fix-ppc-build.patch | 17 --------
debian/patches/21-gcc7-compatibility.patch | 49 ++++++++--------------
debian/patches/23-webcore-linker-flags.patch | 18 ++++----
debian/patches/25-webkit-debug-level.patch | 8 ++--
.../patches/26-disable-webkit-jit-for-armv4.patch | 2 +-
debian/patches/27-add-java9-exports.patch | 6 +--
debian/patches/fix-arm32-build.patch | 4 +-
debian/patches/fix-arm64-build.patch | 2 +-
debian/patches/series | 1 -
14 files changed, 44 insertions(+), 101 deletions(-)
diff --git a/debian/patches/02-use-system-libraries.patch b/debian/patches/02-use-system-libraries.patch
index 4e2c176..71f5a83 100644
--- a/debian/patches/02-use-system-libraries.patch
+++ b/debian/patches/02-use-system-libraries.patch
@@ -38,21 +38,6 @@ Forwarded: not-needed
includeEmptyDirs = false
}
}
-@@ -3091,12 +3092,13 @@
- outputs.dir("$webkitOutputDir/$webkitConfig/DerivedSources/WebCore/nativeJava/java")
-
- doLast {
-+/*
- 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")
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -82,6 +82,7 @@
diff --git a/debian/patches/07-disable-assembler-on-unsupported-archs.patch b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
index 6198aac..1363527 100644
--- a/debian/patches/07-disable-assembler-on-unsupported-archs.patch
+++ b/debian/patches/07-disable-assembler-on-unsupported-archs.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- 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 @@
+@@ -360,6 +360,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 2ce459a..0391f87 100644
--- a/debian/patches/08-disable-sse2.patch
+++ b/debian/patches/08-disable-sse2.patch
@@ -62,14 +62,3 @@ 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/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.
- determineArchitecture();
-- if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
-+ if ($architecture eq "i686" && !isARM() && !isCrossCompilation() && !isAnyWindows()) {
- $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
- }
-
diff --git a/debian/patches/10-javadoc-locale.patch b/debian/patches/10-javadoc-locale.patch
index 66b06c4..816cbd0 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
-@@ -3589,6 +3589,7 @@
+@@ -3558,6 +3558,7 @@
options.windowTitle("${javadocTitle}")
options.header("${javadocHeader}")
options.bottom("${javadocBottom}")
diff --git a/debian/patches/19-disable-webkit-sampling-profiler.patch b/debian/patches/19-disable-webkit-sampling-profiler.patch
index 1ce80c1..d6adc3c 100644
--- a/debian/patches/19-disable-webkit-sampling-profiler.patch
+++ b/debian/patches/19-disable-webkit-sampling-profiler.patch
@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- 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)
+@@ -163,7 +163,7 @@
+ WEBKIT_OPTION_DEFINE(ENABLE_RESOLUTION_MEDIA_QUERY "Toggle resolution media query support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_RESOURCE_USAGE "Toggle resource usage support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_RUBBER_BANDING "Toggle rubber banding support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE ON)
+ WEBKIT_OPTION_DEFINE(ENABLE_SAMPLING_PROFILER "Toggle sampling profiler support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_SECCOMP_FILTERS "Toggle Linux seccomp filters for the WebProcess support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_SERVICE_CONTROLS "Toggle service controls support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_SHADOW_DOM "Toggle shadow dom" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_SMOOTH_SCROLLING "Toggle smooth scrolling" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_SPEECH_SYNTHESIS "Toggle Speech Synthesis API support)" PRIVATE OFF)
diff --git a/debian/patches/20-fix-ppc-build.patch b/debian/patches/20-fix-ppc-build.patch
deleted file mode 100644
index fbc012b..0000000
--- a/debian/patches/20-fix-ppc-build.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/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 @@
- }
-
- ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
-+#if CPU(PPC)
-+ thread->suspendedMachineContext = *userContext->uc_mcontext.uc_regs;
-+#else
- thread->suspendedMachineContext = userContext->uc_mcontext;
-+#endif
-
- // Allow suspend caller to see that this thread is suspended.
- // sem_post is async-signal-safe function. It means that we can call this from a signal handler.
diff --git a/debian/patches/21-gcc7-compatibility.patch b/debian/patches/21-gcc7-compatibility.patch
index a261d3b..c7aed0a 100644
--- a/debian/patches/21-gcc7-compatibility.patch
+++ b/debian/patches/21-gcc7-compatibility.patch
@@ -1,54 +1,41 @@
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/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)
+@@ -38,7 +38,9 @@
+ define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name")
- if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+ if (COMPILER_IS_GCC_OR_CLANG)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing")
- # set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing") #//XXX disable RTTI?
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing")
+ 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")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
endif ()
---- 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();
-
-- void* vector()
-+ void* vector() const
- {
- return m_vector.getPredicated(
- this,
--- 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 @@
+@@ -28,6 +28,7 @@
#include "InspectorFrontendRouter.h"
#include "InspectorProtocolTypes.h"
+#include <functional>
+ #include <wtf/DeprecatedOptional.h>
#include <wtf/Optional.h>
#include <wtf/RefCounted.h>
- #include <wtf/text/WTFString.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 @@
+@@ -22,6 +22,7 @@
- #include "ExceptionCode.h"
+ #include "ExceptionOr.h"
#include "URLHash.h"
+#include <functional>
+ #include <wtf/HashMap.h>
#include <wtf/ListHashSet.h>
#include <wtf/RefCounted.h>
- #include <wtf/RefPtr.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 @@
+@@ -23,6 +23,7 @@
#include "CSSParserMode.h"
#include "CachePolicy.h"
#include "URL.h"
@@ -58,18 +45,18 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
#include <wtf/RefCounted.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)
+@@ -27,6 +27,7 @@
+ #include "RenderTreeUpdater.h"
+ #include "ShadowRoot.h"
+#include <functional>
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
#include <wtf/Vector.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
+@@ -29,6 +29,7 @@
+ #pragma once
#include "ResourceLoader.h"
+#include <functional>
@@ -85,4 +72,4 @@ Origin: backport, http://trac.webkit.org/changeset/217601/webkit
+#include <functional>
#include <wtf/Forward.h>
- namespace WTF {
+ #if ENABLE(CONTENT_EXTENSIONS)
diff --git a/debian/patches/23-webcore-linker-flags.patch b/debian/patches/23-webcore-linker-flags.patch
index 5942b40..bee0356 100644
--- a/debian/patches/23-webcore-linker-flags.patch
+++ b/debian/patches/23-webcore-linker-flags.patch
@@ -4,12 +4,12 @@ Forwarded: no
Bug-Debian: https://bugs.debian.org/857464
--- 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")
- elseif (UNIX)
-- set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
-+ set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
- elseif (WIN32)
- # Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
- set_target_properties(WebCore PROPERTIES LINK_FLAGS "${CMAKE_BINARY_DIR}/WebCore/obj/version.res")
+@@ -3837,7 +3837,7 @@
+ set_target_properties(WebCore PROPERTIES LINK_FLAGS "-exported_symbols_list ${WEBCORE_DIR}/mapfile-macosx")
+ add_custom_target(WebCore_map DEPENDS "${WEBCORE_DIR}/mapfile-macosx")
+ elseif (UNIX)
+- set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -Wl,--no-undefined")
++ set_target_properties(WebCore PROPERTIES LINK_FLAGS "-Xlinker -version-script=${WEBCORE_DIR}/mapfile-vers -fuse-ld=gold -Wl,--no-undefined -Wl,--no-keep-memory -Wl,--no-map-whole-files -Wl,--no-keep-files-mapped")
+ add_custom_target(WebCore_map DEPENDS "${WEBCORE_DIR}/mapfile-vers")
+ elseif (WIN32)
+ # Adds version information to jfxwebkit.dll created by Gradle build, see JDK-8166265
diff --git a/debian/patches/25-webkit-debug-level.patch b/debian/patches/25-webkit-debug-level.patch
index bb164bd..c7a5929 100644
--- a/debian/patches/25-webkit-debug-level.patch
+++ b/debian/patches/25-webkit-debug-level.patch
@@ -4,12 +4,12 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
--- 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 @@
+@@ -43,6 +43,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")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g1")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g1")
endif ()
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" AND CMAKE_GENERATOR STREQUAL "Ninja")
+ if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja")
diff --git a/debian/patches/26-disable-webkit-jit-for-armv4.patch b/debian/patches/26-disable-webkit-jit-for-armv4.patch
index 2b2528a..3c96fed 100644
--- a/debian/patches/26-disable-webkit-jit-for-armv4.patch
+++ b/debian/patches/26-disable-webkit-jit-for-armv4.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- 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 @@
+@@ -738,6 +738,11 @@
#define ENABLE_JIT 1
#endif
diff --git a/debian/patches/27-add-java9-exports.patch b/debian/patches/27-add-java9-exports.patch
index 7ae3bc3..1d1c59f 100644
--- a/debian/patches/27-add-java9-exports.patch
+++ b/debian/patches/27-add-java9-exports.patch
@@ -121,7 +121,7 @@ Forwarded: http://mail.openjdk.java.net/pipermail/openjfx-dev/2017-October/02088
project.ext.moduleSourcePath = defaultModuleSourcePath
project.ext.moduleSourcePathShim = defaultModuleSourcePathShim
-@@ -3207,6 +3269,12 @@
+@@ -3175,6 +3237,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
])
}
-@@ -3463,7 +3531,17 @@
+@@ -3431,7 +3499,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)
-@@ -3601,6 +3679,21 @@
+@@ -3569,6 +3647,21 @@
options.addBooleanOption("javafx").setValue(true);
options.addBooleanOption("use").setValue(true);
diff --git a/debian/patches/fix-arm32-build.patch b/debian/patches/fix-arm32-build.patch
index 5dee8d3..0bedfc8 100644
--- a/debian/patches/fix-arm32-build.patch
+++ b/debian/patches/fix-arm32-build.patch
@@ -90,9 +90,9 @@
LINUX.iio.nativeSource = [
--- a/build.gradle
+++ b/build.gradle
-@@ -3125,9 +3125,6 @@
+@@ -3108,9 +3108,6 @@
} else if (t.name == "mac") {
- // Add any osx specific flags.
+ cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
} else if (t.name == "linux") {
- if (!IS_64) {
- cmakeArgs = "-DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32"
diff --git a/debian/patches/fix-arm64-build.patch b/debian/patches/fix-arm64-build.patch
index 5b2707d..e53b346 100644
--- a/debian/patches/fix-arm64-build.patch
+++ b/debian/patches/fix-arm64-build.patch
@@ -7,7 +7,7 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752735
Forwarded: no
--- 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 @@
+@@ -187,6 +187,9 @@
/* CPU(ARM64) - Apple */
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
#define WTF_CPU_ARM64 1
diff --git a/debian/patches/series b/debian/patches/series
index 622e998..5b6f4f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,6 @@ fix-arm32-build.patch
16-reproducible-build-timestamp.patch
17-gcc-compatibility.patch
19-disable-webkit-sampling-profiler.patch
-20-fix-ppc-build.patch
21-gcc7-compatibility.patch
22-JDK-8185792-accented-characters-support.patch
23-webcore-linker-flags.patch
--
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