[openjfx] 06/11: Fixed the build failure with GCC 7 (Closes: #853593)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 897a338c90b7bf6d0d02e37d6342246ac0619cfe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 3 16:06:50 2017 +0200

    Fixed the build failure with GCC 7 (Closes: #853593)
---
 debian/changelog                           |  1 +
 debian/patches/21-gcc7-compatibility.patch | 88 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 90 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6695547..733babe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openjfx (8u141-b14-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release:
     - Fixes CVE-2017-10086 and CVE-2017-10114 (Closes: #870860)
+  * Fixed the build failure with GCC 7 (Closes: #853593)
   * Fixed a build failure on powerpc caused by a different ucontext_t definition
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Apr 2017 10:12:13 +0200
diff --git a/debian/patches/21-gcc7-compatibility.patch b/debian/patches/21-gcc7-compatibility.patch
new file mode 100644
index 0000000..59c911c
--- /dev/null
+++ b/debian/patches/21-gcc7-compatibility.patch
@@ -0,0 +1,88 @@
+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
+@@ -26,8 +26,10 @@
+ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ 
+ if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "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_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")
+ endif ()
+--- a/modules/web/src/main/native/Source/JavaScriptCore/runtime/JSArrayBufferView.h
++++ b/modules/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/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
++++ b/modules/web/src/main/native/Source/JavaScriptCore/inspector/InspectorBackendDispatcher.h
+@@ -29,6 +29,7 @@
+ 
+ #include "InspectorFrontendRouter.h"
+ #include "InspectorProtocolTypes.h"
++#include <functional>
+ #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
+@@ -23,6 +23,7 @@
+ 
+ #include "ExceptionCode.h"
+ #include "URLHash.h"
++#include <functional>
+ #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
+@@ -24,6 +24,7 @@
+ #include "CSSParserMode.h"
+ #include "CachePolicy.h"
+ #include "URL.h"
++#include <functional>
+ #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
+@@ -28,6 +28,7 @@
+ 
+ #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ 
++#include <functional>
+ #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
+@@ -30,6 +30,7 @@
+ #define NetscapePlugInStreamLoader_h
+ 
+ #include "ResourceLoader.h"
++#include <functional>
+ #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
+@@ -34,6 +34,7 @@
+ #include "ResourceLoaderTypes.h"
+ #include "ResourceRequest.h"
+ #include "ResourceResponse.h"
++#include <functional>
+ #include <wtf/Forward.h>
+ 
+ namespace WTF {
diff --git a/debian/patches/series b/debian/patches/series
index d0c297d..8eeb82a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ fix-arm32-build.patch
 17-gcc-compatibility.patch
 19-disable-webkit-sampling-profiler.patch
 20-fix-ppc-build.patch
+21-gcc7-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git