[openjfx] 02/04: Reworked the patch disabling the sampling profiler to reduce compiler warnings

[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 c3c1a4ec9a7232df8feeedd2bd6274302a91f876
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 6 10:09:56 2017 +0200

    Reworked the patch disabling the sampling profiler to reduce compiler warnings
---
 debian/changelog                                   |  2 ++
 .../19-disable-webkit-sampling-profiler.patch      | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9eac81..42a544f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openjfx (8u141-b14-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Compile WebKit with the -g1 debugging level to reduce the memory used
+  * Reworked the patch disabling the sampling profiler to stop the compiler
+    from complaining about the redefinition of ENABLE_SAMPLING_PROFILER.
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 06 Oct 2017 10:05:51 +0200
 
diff --git a/debian/patches/19-disable-webkit-sampling-profiler.patch b/debian/patches/19-disable-webkit-sampling-profiler.patch
index 3162bed..d711bd8 100644
--- a/debian/patches/19-disable-webkit-sampling-profiler.patch
+++ b/debian/patches/19-disable-webkit-sampling-profiler.patch
@@ -1,14 +1,14 @@
 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/WTF/wtf/Platform.h
-+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h
-@@ -847,6 +847,8 @@
- #endif
- #endif
- 
-+#define ENABLE_SAMPLING_PROFILER 0
-+
- /* Counts uses of write barriers using sampling counters. Be sure to also
-    set ENABLE_SAMPLING_COUNTERS to 1. */
- #if !defined(ENABLE_WRITE_BARRIER_PROFILING)
+--- a/modules/web/src/main/native/Source/cmake/WebKitFeatures.cmake
++++ b/modules/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)
+     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)

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