mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-26 08:51:25 +02:00
85 lines
3.8 KiB
Diff
85 lines
3.8 KiB
Diff
diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
|
|
--- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2019-02-11 18:55:48.607258656 +0100
|
|
+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2019-02-11 20:57:51.386533134 +0100
|
|
@@ -46,6 +46,7 @@
|
|
#include <sys/mman.h>
|
|
#include <sys/stat.h>
|
|
#include <unistd.h>
|
|
+#include <libgen.h>
|
|
|
|
#include <iostream>
|
|
#include <set>
|
|
diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
|
|
--- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2019-02-11 18:55:48.610591990 +0100
|
|
+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2019-02-11 20:57:51.386533134 +0100
|
|
@@ -41,6 +41,10 @@
|
|
|
|
#include "common/using_std_string.h"
|
|
|
|
+#ifndef N_UNDF
|
|
+#define N_UNDF 0
|
|
+#endif
|
|
+
|
|
using std::vector;
|
|
|
|
namespace google_breakpad {
|
|
diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
|
|
--- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2019-02-11 18:55:48.610591990 +0100
|
|
+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2019-02-11 20:57:51.389866466 +0100
|
|
@@ -55,7 +55,7 @@
|
|
|
|
#ifdef HAVE_MACH_O_NLIST_H
|
|
#include <mach-o/nlist.h>
|
|
-#elif defined(HAVE_A_OUT_H)
|
|
+#elif 0
|
|
#include <a.out.h>
|
|
#endif
|
|
|
|
diff -upr /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
|
|
--- /tmp/firefox-60.5.0.orig/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2019-02-11 18:55:48.647258669 +0100
|
|
+++ firefox-60.5.0/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2019-02-11 19:01:23.614038547 +0100
|
|
@@ -1210,6 +1210,12 @@ struct kernel_statfs {
|
|
#ifndef __NR_fallocate
|
|
#define __NR_fallocate 285
|
|
#endif
|
|
+
|
|
+#undef __NR_pread
|
|
+#define __NR_pread __NR_pread64
|
|
+#undef __NR_pwrite
|
|
+#define __NR_pwrite __NR_pwrite64
|
|
+
|
|
/* End of x86-64 definitions */
|
|
#elif defined(__mips__)
|
|
#if _MIPS_SIM == _MIPS_SIM_ABI32
|
|
diff -upr /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/common/updatedefines.h firefox-60.5.0/toolkit/mozapps/update/common/updatedefines.h
|
|
--- /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/common/updatedefines.h 2019-02-11 18:55:49.287258893 +0100
|
|
+++ firefox-60.5.0/toolkit/mozapps/update/common/updatedefines.h 2019-02-11 20:58:30.753178073 +0100
|
|
@@ -100,7 +100,7 @@ static inline int mywcsprintf(WCHAR* des
|
|
|
|
#ifdef SOLARIS
|
|
#include <sys/stat.h>
|
|
-#else
|
|
+#elif !defined(__linux__) || defined(__GLIBC__)
|
|
#include <fts.h>
|
|
#endif
|
|
#include <dirent.h>
|
|
diff -upr /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/updater/updater.cpp firefox-60.5.0/toolkit/mozapps/update/updater/updater.cpp
|
|
--- /tmp/firefox-60.5.0.orig/toolkit/mozapps/update/updater/updater.cpp 2019-02-11 18:55:49.283925558 +0100
|
|
+++ firefox-60.5.0/toolkit/mozapps/update/updater/updater.cpp 2019-02-11 20:57:57.303196520 +0100
|
|
@@ -3733,6 +3733,7 @@ int add_dir_entries(const NS_tchar *dirp
|
|
|
|
int add_dir_entries(const NS_tchar *dirpath, ActionList *list) {
|
|
int rv = OK;
|
|
+#if !defined(__linux__) || defined(__GLIBC__)
|
|
FTS *ftsdir;
|
|
FTSENT *ftsdirEntry;
|
|
mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
|
|
@@ -3833,6 +3834,7 @@ int add_dir_entries(const NS_tchar *dirp
|
|
}
|
|
|
|
fts_close(ftsdir);
|
|
+#endif
|
|
|
|
return rv;
|
|
}
|