diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-29 16:02:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-10-29 16:38:44 +0000 |
| commit | 95489293ef40dfd46498b08f2dfb3b6fa1c288ec (patch) | |
| tree | 5a4391756bb5fbe4172b852add03e1086b74f64b /main/firefox/fix-ipc.patch | |
| parent | ee754870689436f39cc3500b4d3af63435fb0eb3 (diff) | |
| download | aports-95489293ef40dfd46498b08f2dfb3b6fa1c288ec.tar.bz2 aports-95489293ef40dfd46498b08f2dfb3b6fa1c288ec.tar.xz | |
main/firefox: upgrade to 31.2.0 esr
dont build xulrunner separately
Diffstat (limited to 'main/firefox/fix-ipc.patch')
| -rw-r--r-- | main/firefox/fix-ipc.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/main/firefox/fix-ipc.patch b/main/firefox/fix-ipc.patch new file mode 100644 index 000000000..e21d57f40 --- /dev/null +++ b/main/firefox/fix-ipc.patch @@ -0,0 +1,66 @@ +--- mozilla-release.orig/ipc/chromium/src/base/debug_util_posix.cc ++++ mozilla-release/ipc/chromium/src/base/debug_util_posix.cc +@@ -5,7 +5,7 @@ + #include "build/build_config.h" + #include "base/debug_util.h" + +-#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && !defined(ANDROID)) ++#define MOZ_HAVE_EXECINFO_H (defined(OS_LINUX) && defined(__GLIBC__)) + + #include <errno.h> + #include <fcntl.h> +--- mozilla-release.orig/ipc/chromium/src/base/file_util.h ++++ mozilla-release/ipc/chromium/src/base/file_util.h +@@ -14,10 +14,15 @@ + #include <windows.h> + #elif defined(ANDROID) + #include <sys/stat.h> ++#define NO_FTS + #elif defined(OS_POSIX) + #include <sys/types.h> +-#include <fts.h> + #include <sys/stat.h> ++#ifdef __GLIBC__ ++#include <fts.h> ++#else ++#define NO_FTS ++#endif + #endif + + #include <stdio.h> +--- mozilla-release.orig/ipc/chromium/src/base/file_util_posix.cc ++++ mozilla-release/ipc/chromium/src/base/file_util_posix.cc +@@ -8,13 +8,13 @@ + #include <errno.h> + #include <fcntl.h> + #include <fnmatch.h> +-#ifndef ANDROID ++#ifndef NO_FTS + #include <fts.h> + #endif + #include <libgen.h> + #include <stdio.h> + #include <string.h> +-#include <sys/errno.h> ++#include <errno.h> + #include <sys/mman.h> + #define _DARWIN_USE_64_BIT_INODE // Use 64-bit inode data structures + #include <sys/stat.h> +@@ -67,7 +67,7 @@ + if (!recursive) + return (rmdir(path_str) == 0); + +-#ifdef ANDROID ++#ifdef NO_FTS + // XXX Need ftsless impl for bionic + return false; + #else +@@ -140,7 +140,7 @@ + return false; + } + +-#ifdef ANDROID ++#ifdef NO_FTS + // XXX Need ftsless impl for bionic + return false; + #else |