aboutsummaryrefslogtreecommitdiffstats
path: root/testing/firefox/fix-tools.patch
diff options
context:
space:
mode:
authorFrançois Chavant <alpine@mail.chavant.info>2017-06-14 10:22:53 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-06-14 10:56:06 +0000
commit537eca77919a5b8d465ad8f7da066935decc8886 (patch)
tree9baad355a594a0c5d0383b2c27b37e73ec00fbaa /testing/firefox/fix-tools.patch
parent984fdae4a78f4ba42bc6aab0cf55de49ca7ca274 (diff)
downloadaports-537eca77919a5b8d465ad8f7da066935decc8886.tar.bz2
aports-537eca77919a5b8d465ad8f7da066935decc8886.tar.xz
testing/firefox: update to version 54.0
Diffstat (limited to 'testing/firefox/fix-tools.patch')
-rw-r--r--testing/firefox/fix-tools.patch24
1 files changed, 5 insertions, 19 deletions
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch
index ea5a2cd785..c7357b6f7e 100644
--- a/testing/firefox/fix-tools.patch
+++ b/testing/firefox/fix-tools.patch
@@ -1,8 +1,6 @@
-diff --git a/tools/profiler/core/platform-linux.cc b/tools/profiler/core/platform-linux.cc
-index 0df1e8f..d868895 100644
---- a/tools/profiler/core/platform-linux.cc
-+++ b/tools/profiler/core/platform-linux.cc
-@@ -711,11 +711,13 @@ void OS::Startup() {
+--- a/tools/profiler/core/platform-linux-android.cpp
++++ b/tools/profiler/core/platform-linux-android.cpp
+@@ -715,11 +715,13 @@
void TickSample::PopulateContext(void* aContext)
{
MOZ_ASSERT(aContext);
@@ -10,25 +8,13 @@ index 0df1e8f..d868895 100644
ucontext_t* pContext = reinterpret_cast<ucontext_t*>(aContext);
if (!getcontext(pContext)) {
context = pContext;
- SetSampleContext(this, aContext);
+ SetSampleContext(this,
+ reinterpret_cast<ucontext_t*>(aContext)->uc_mcontext);
}
+#endif
}
void OS::SleepMicro(int microseconds)
-diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h
-index a38b3b5..170bd75 100644
---- a/tools/profiler/core/platform.h
-+++ b/tools/profiler/core/platform.h
-@@ -34,6 +34,8 @@
- #define MOZ_COUNT_DTOR(name)
- #endif
-
-+#include <sys/types.h>
-+
- #ifdef ANDROID
- #include <android/log.h>
- #else
diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp
index a922137..d01dde1 100644
--- a/tools/profiler/lul/LulElf.cpp