diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-02-11 18:54:09 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-02-13 20:55:44 +0100 |
| commit | 50d6c8f738e21e88d0ebbdf4007cde60d258d012 (patch) | |
| tree | 4737514748e9472796eae38fac218d5098c953b4 /community/firefox-esr/fix-tools.patch | |
| parent | f6e0f94b430e8a85e14e8d64438dac12c0b455c8 (diff) | |
| download | aports-50d6c8f738e21e88d0ebbdf4007cde60d258d012.tar.bz2 aports-50d6c8f738e21e88d0ebbdf4007cde60d258d012.tar.xz | |
community/firefox-esr: upgrade to 60.5.0
OK ncopa@
Diffstat (limited to 'community/firefox-esr/fix-tools.patch')
| -rw-r--r-- | community/firefox-esr/fix-tools.patch | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/community/firefox-esr/fix-tools.patch b/community/firefox-esr/fix-tools.patch index 84f7fa9cb8..fdb08845d9 100644 --- a/community/firefox-esr/fix-tools.patch +++ b/community/firefox-esr/fix-tools.patch @@ -1,22 +1,38 @@ ---- a/tools/profiler/core/platform.h -+++ b/tools/profiler/core/platform.h +diff -upr /tmp/firefox-60.5.0.orig/tools/profiler/core/platform-linux-android.cpp firefox-60.5.0/tools/profiler/core/platform-linux-android.cpp +--- /tmp/firefox-60.5.0.orig/tools/profiler/core/platform-linux-android.cpp 2019-02-11 18:55:48.543925300 +0100 ++++ firefox-60.5.0/tools/profiler/core/platform-linux-android.cpp 2019-02-12 10:00:02.735569929 +0100 +@@ -497,8 +497,10 @@ static void PlatformInit(PSLockRef aLock + ucontext_t sSyncUContext; + + void Registers::SyncPopulate() { ++#if defined(__GLIBC__) + if (!getcontext(&sSyncUContext)) { + PopulateRegsFromContext(*this, &sSyncUContext); + } ++#endif + } + #endif +diff -upr /tmp/firefox-60.5.0.orig/tools/profiler/core/platform.h firefox-60.5.0/tools/profiler/core/platform.h +--- /tmp/firefox-60.5.0.orig/tools/profiler/core/platform.h 2019-02-11 18:55:48.540591965 +0100 ++++ firefox-60.5.0/tools/profiler/core/platform.h 2019-02-12 10:00:02.735569929 +0100 @@ -29,6 +29,8 @@ #ifndef TOOLS_PLATFORM_H_ #define TOOLS_PLATFORM_H_ - + +#include <sys/types.h> + #include <stdint.h> #include <math.h> #include "MainThreadUtils.h" ---- a/tools/profiler/lul/LulElf.cpp -+++ b/tools/profiler/lul/LulElf.cpp -@@ -579,10 +579,10 @@ +diff -upr /tmp/firefox-60.5.0.orig/tools/profiler/lul/LulElf.cpp firefox-60.5.0/tools/profiler/lul/LulElf.cpp +--- /tmp/firefox-60.5.0.orig/tools/profiler/lul/LulElf.cpp 2019-02-11 18:55:48.547258635 +0100 ++++ firefox-60.5.0/tools/profiler/lul/LulElf.cpp 2019-02-12 10:00:59.802296448 +0100 +@@ -459,10 +459,10 @@ string FormatIdentifier(unsigned char id // Return the non-directory portion of FILENAME: the portion after the // last slash, or the whole filename if there are no slashes. - string BaseFileName(const string &filename) { + string BaseFileName(const string& filename) { - // Lots of copies! basename's behavior is less than ideal. -- char *c_filename = strdup(filename.c_str()); +- char* c_filename = strdup(filename.c_str()); - string base = basename(c_filename); - free(c_filename); + // basename's behavior is less than ideal so avoid it @@ -25,18 +41,4 @@ + string base = p ? p+1 : c_filename; return base; } - ---- a/tools/profiler/core/platform-linux-android.cpp.orig -+++ b/tools/profiler/core/platform-linux-android.cpp -@@ -534,9 +534,11 @@ - void - Registers::SyncPopulate() - { -+#if defined(__GLIBC__) - if (!getcontext(&sSyncUContext)) { - PopulateRegsFromContext(*this, &sSyncUContext); - } -+#endif - } - #endif |