diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-10-26 17:04:12 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2019-10-26 23:11:17 +0200 |
| commit | 7e130731a332e3d5d593b52869e2f4e02da33f59 (patch) | |
| tree | 5078b4359f3939c406c071405faea8bedc516154 /testing/thunderbird/fix-toolkit.patch | |
| parent | 00be3a44472d6239a5052218d41d055fba9b3634 (diff) | |
| download | aports-7e130731a332e3d5d593b52869e2f4e02da33f59.tar.bz2 aports-7e130731a332e3d5d593b52869e2f4e02da33f59.tar.xz | |
testing/thunderbird: upgrade to 68.2.0
Diffstat (limited to 'testing/thunderbird/fix-toolkit.patch')
| -rw-r--r-- | testing/thunderbird/fix-toolkit.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/testing/thunderbird/fix-toolkit.patch b/testing/thunderbird/fix-toolkit.patch index 8c7ebc1c86..414734dfec 100644 --- a/testing/thunderbird/fix-toolkit.patch +++ b/testing/thunderbird/fix-toolkit.patch @@ -2,7 +2,7 @@ diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols index 4222ce3..4d40c6a 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc -@@ -45,6 +45,7 @@ +@@ -46,6 +46,7 @@ #include <sys/mman.h> #include <sys/stat.h> #include <unistd.h> @@ -42,7 +42,7 @@ diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_sys index 93fdad7..f34e5e0 100644 --- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h +++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h -@@ -1134,6 +1134,12 @@ struct kernel_statfs { +@@ -1239,6 +1239,12 @@ struct kernel_statfs { #ifndef __NR_fallocate #define __NR_fallocate 285 #endif @@ -59,28 +59,28 @@ diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/upd index 79276f7..4c67976 100644 --- a/toolkit/mozapps/update/common/updatedefines.h +++ b/toolkit/mozapps/update/common/updatedefines.h -@@ -100,7 +100,7 @@ static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, +@@ -87,7 +87,7 @@ static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, - #ifdef SOLARIS - #include <sys/stat.h> --#else -+#elif !defined(__linux__) || defined(__GLIBC__) - #include <fts.h> - #endif - #include <dirent.h> + # ifdef SOLARIS + # include <sys/stat.h> +-# else ++# elif !defined(__linux__) || defined(__GLIBC__) + # include <fts.h> + # endif + # include <dirent.h> diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 257ccb4..01314e4 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp -@@ -3737,6 +3737,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list) - int add_dir_entries(const NS_tchar *dirpath, ActionList *list) - { +@@ -3978,6 +3978,7 @@ + + int add_dir_entries(const NS_tchar* dirpath, ActionList* list) { int rv = OK; +#if !defined(__linux__) || defined(__GLIBC__) - FTS *ftsdir; - FTSENT *ftsdirEntry; - NS_tchar searchpath[MAXPATHLEN]; -@@ -3840,6 +3841,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list) + FTS* ftsdir; + FTSENT* ftsdirEntry; + mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath)); +@@ -4085,6 +4086,7 @@ } fts_close(ftsdir); |