3 files changed, 35 insertions, 21 deletions
diff --git a/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch b/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
deleted file mode 100644
index c37edda2..00000000
--- a/www-client/firefox/files/firefox-32.0-hppa-js-configure.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/mozilla-release/js/src/configure.in
-+++ b/mozilla-release/js/src/configure.in
-@@ -958,7 +958,7 @@
-     CPU_ARCH=s390x
-     ;;
- 
--hppa* | parisc)
-+hppa* | parisc*)
-     CPU_ARCH=hppa
-     ;;
- 
-@@ -2009,6 +2009,9 @@
-     AC_DEFINE(JS_CPU_MIPS)
-     AC_DEFINE(JS_NUNBOX32)
-     ;;
-+hppa*)
-+    AC_DEFINE(JS_NUNBOX32)
-+    ;;
- esac
- 
- MOZ_ARG_DISABLE_BOOL(ion,
diff --git a/www-client/firefox/files/firefox-47.0-crashreporter.patch b/www-client/firefox/files/firefox-47.0-crashreporter.patch
new file mode 100644
index 00000000..7b3bf3da
--- /dev/null
+++ b/www-client/firefox/files/firefox-47.0-crashreporter.patch
@@ -0,0 +1,27 @@
+--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
++++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+@@ -920,10 +920,9 @@ string FormatIdentifier(unsigned char identifier[16]) {
+ // 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) {
+-  // Lots of copies!  basename's behavior is less than ideal.
+-  char* c_filename = strdup(filename.c_str());
+-  string base = basename(c_filename);
+-  free(c_filename);
++  const char *c_filename = filename.c_str();
++  const char *p = strrchr(c_filename, '/');
++  string base = p ? p+1 : c_filename;
+   return base;
+ }
+ 
+--- 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
+@@ -3851,7 +3851,7 @@ struct kernel_statfs {
+         return -1;
+     }
+   }
+-  #if defined(__x86_64__)
++  #if defined(__x86_64__) && defined(__ILP32__)
+     /* Need to make sure loff_t isn't truncated to 32-bits under x32.  */
+     LSS_INLINE ssize_t LSS_NAME(pread64)(int f, void *b, size_t c, loff_t o) {
+       LSS_BODY(4, ssize_t, pread64, LSS_SYSCALL_ARG(f), LSS_SYSCALL_ARG(b),
diff --git a/www-client/firefox/files/firefox-47.0-define-HUNSPELL_STATIC-conditionally.patch b/www-client/firefox/files/firefox-47.0-define-HUNSPELL_STATIC-conditionally.patch
new file mode 100644
index 00000000..f7fb3b30
--- /dev/null
+++ b/www-client/firefox/files/firefox-47.0-define-HUNSPELL_STATIC-conditionally.patch
@@ -0,0 +1,8 @@
+--- a/extensions/spellcheck/hunspell/glue/moz.build
++++ b/extensions/spellcheck/hunspell/glue/moz.build
+@@ -38,4 +38,4 @@ if CONFIG['GNU_CXX']:
+ 
+ # This variable is referenced in configure.in.  Make sure to change that file
+ # too if you need to change this variable.
+-DEFINES['HUNSPELL_STATIC'] = True
++DEFINES['HUNSPELL_STATIC'] = not CONFIG['MOZ_NATIVE_HUNSPELL']