[openjfx] 01/01: Reverted the patch disabling the sampling profiler to its initial state

[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 bef60a9fe6db34fa5fd026990b835e0745f0c89a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 4 22:45:33 2017 +0200

    Reverted the patch disabling the sampling profiler to its initial state
---
 debian/changelog                                       |  7 +++++++
 .../patches/19-disable-webkit-sampling-profiler.patch  | 18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd39519..c4ca009 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openjfx (8u141-b14-2) unstable; urgency=medium
+
+  * Team upload.
+  * Reverted the patch disabling the sampling profiler to its initial state
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 04 Oct 2017 22:45:26 +0200
+
 openjfx (8u141-b14-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/19-disable-webkit-sampling-profiler.patch b/debian/patches/19-disable-webkit-sampling-profiler.patch
index 085ab49..3162bed 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 profilter in WebKit (fails to build on arm64)
+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
-@@ -841,7 +841,7 @@
-  * sampling profiler is enabled if WebKit uses pthreads and glibc. */
- #if !defined(ENABLE_SAMPLING_PROFILER)
- #if (OS(DARWIN) || OS(WINDOWS) || PLATFORM(GTK) || PLATFORM(EFL)) && ENABLE(JIT)
--#define ENABLE_SAMPLING_PROFILER 1
-+#define ENABLE_SAMPLING_PROFILER 0
- #else
- #define ENABLE_SAMPLING_PROFILER 0
+@@ -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)

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