testing/firefox: upgrade to 40.0

4 files changed, 49 insertions, 157 deletions

diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index 3fff9a8c1f..0a6b297707 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -1,10 +1,10 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox
-pkgver=39.0.3
+pkgver=40.0
 _pkgver=$pkgver
 _xulver=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="Firefox web browser"
 url="http://www.firefox.com"
 arch="all"
@@ -56,7 +56,6 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 
 	0002-Use-C99-math-isfinite.patch
 	fix-arm-atomics-grsec.patch
-	fix-ipc.patch
 	fix-toolkit.patch
 	fix-tools.patch
 	fix-linux-include.patch
@@ -166,14 +165,13 @@ dev() {
 	default_dev
 }
 
-md5sums="6ef31cbd34d9905a0648104d916269cb  firefox-39.0.3.source.tar.bz2
+md5sums="62b9e6a4a46874a0be523fe41d3176e2  firefox-40.0.source.tar.bz2
 1f4c60e662ed93784431bd06c5141719  mozconfig
 1515663477ce427cbdc42f04d8d5ca4e  vendor.js
 6ab77b80c8c7d6fd07ab53c54561f4df  0002-Use-C99-math-isfinite.patch
 b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
-0c453c2e058ac568e0148c02b1c09abd  fix-ipc.patch
-296954be4c6d6bfcc24d0a46a2bd7d74  fix-toolkit.patch
-2279c55a85013fc1c0d01427768edd4d  fix-tools.patch
+94ae976a54d1f84bf13d059c1e44ddf5  fix-toolkit.patch
+e64688ad989c22559bed2163dd4d908f  fix-tools.patch
 2f0b995b1313884b10e4a61c2ce2cd01  fix-linux-include.patch
 507742325de8687529e4e81e31132ddf  getchar.patch
 308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
@@ -184,14 +182,13 @@ f29e0036edc7b3a4158a82fa97bde500  fix-fortify-inline.patch
 9aba3811121f113fe547947591802d2b  fix-fortify-system-wrappers.patch
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
-sha256sums="8c16df4ce94b30f1308655f9ed6ac3e76aaa2eb3643739b9263226c086d0177b  firefox-39.0.3.source.tar.bz2
+sha256sums="e3a26164b3a7f1aefbe13a07f0fdcd322726e4bb8c7e9432d1671c8c9e37145a  firefox-40.0.source.tar.bz2
 23c2b4535ce83c92ba978e15ce328c9f140def155d12523c00df30baf41b98dc  mozconfig
 d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46  vendor.js
 080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e  0002-Use-C99-math-isfinite.patch
 ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomics-grsec.patch
-fa7d50f399b6fc1ec1c007cabadc5c0cb9e1daf92c7f6ad89f651b8ce268c765  fix-ipc.patch
-666883189dba3f4c7ba6b5bc85026c85bcb84477c2d5ba00d6414ddd0f744368  fix-toolkit.patch
-60ed0870119480994c6c455034c52dd21b8482b7617c3a0032e3b2abf4467e4d  fix-tools.patch
+195cc0b2008f6728e9d85ca787960bb47d7fba723e10d29e255baaa3bd5dd4dc  fix-toolkit.patch
+b05ab3f79d6f4c4e0b81db4279b4ef8bd65b9ecf8667d3711c73fafc83f25d8e  fix-tools.patch
 a3a6291888819e0f10e3ca05b2979093b32c723c4bf67b19ea1ab14555085236  fix-linux-include.patch
 d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
@@ -202,14 +199,13 @@ ecf808ef1bc2920f6f7a4786fafb46c74e8a2c3bc628f28f10d6e8e1a265e609  fix-fortify-in
 cd19195cb4c316ad9f7d377cd8581218c888863b1bc4d112c97f48a4425fb946  fix-fortify-system-wrappers.patch
 b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda  firefox.desktop
 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3  firefox-safe.desktop"
-sha512sums="aebb3cf41f50aa8694e914ab5112e8b9fc0f451948f700d0c245ee2cec714a9311aeccbd26de4eca96c12e13f61b30efa780444bc6316cf1851d72c1d35f46e7  firefox-39.0.3.source.tar.bz2
+sha512sums="55f17baa606a005fb779cec40e980ccdd24484b52d8da77fa90a88f4ed87b002cfa5f8aa1ca294a97499c8f885305aa81cf04290c6131f47d458fb604b28bc08  firefox-40.0.source.tar.bz2
 e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5  mozconfig
 93570f821e59af4d233fc4b1df85e1d145a5e041ad402fd72921987a5a2f5218538d7a13d59bbf0bda5e7df1d5281407674a3765625936340106d1185b15b5d8  vendor.js
 7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
 4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
-6419b3ec12c775c8bbce2c5737e68bb6c93f5b6c69af65b4fbbc525de3e2022def61943ab713c278aff9a6c27c1df1e19fb94940a755a94f6b40fd0492fae228  fix-ipc.patch
-72459754016f254c58d56d9a8719897fa8da9cf969eaa498e1e755457942d3f0ac56e4abd3f6a66ef924c94aa034d0af18a1fb653926b2496f0c2615fdb24c5e  fix-toolkit.patch
-426b57ce698de3eecd1b52f2998974c4e0b5922584b09b554d436c61fee039d1f86345e746fee067801ebbf50815c4d19b96266a2ed72a35ae5c3edbdb57bba1  fix-tools.patch
+d3f2ec8684aa485e1d08df325281629adb120f2e79c0065b96e14b99ca2968a3c701d18dda1fd1cab482aec2bc4ee8f294b9fda970ae159f8dab655f2c91aca9  fix-toolkit.patch
+fbd0e61b6a6cd656075e9b2bf30903ef33d2db09109811752b862ad50dbe3371346eaf0399ad16948f04d97827335ab4102be50d3532ef08ab37101ddc02070e  fix-tools.patch
 2c3319fd625c5d183e310ce6a27ec35e91caafd2206b7b992a539924f9bdb001b0340f1f4451650d4d968134ad35ba1f955cacfff10cb58980f27c42c90d280d  fix-linux-include.patch
 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
diff --git a/testing/firefox/fix-ipc.patch b/testing/firefox/fix-ipc.patch
deleted file mode 100644
index 8371957d4b..0000000000
--- a/testing/firefox/fix-ipc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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
diff --git a/testing/firefox/fix-toolkit.patch b/testing/firefox/fix-toolkit.patch
index 0303223652..9fd8ef497c 100644
--- a/testing/firefox/fix-toolkit.patch
+++ b/testing/firefox/fix-toolkit.patch
@@ -88,64 +88,7 @@ diff -ru mozilla-release/toolkit.orig/xre/nsSigHandlers.cpp mozilla-release/tool
  #include <signal.h>
  #include <stdio.h>
  #include <string.h>
-+#include <sys/types.h>
++#include <stdint.h>
  #include "prthread.h"
  #include "plstr.h"
  #include "prenv.h"
-@@ -152,7 +153,7 @@
-   status->__invalid = status->__denorm = status->__zdiv = status->__ovrfl = status->__undfl =
-     status->__precis = status->__stkflt = status->__errsumm = 0;
- 
--  __uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr;
-+  u_int32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr;
-   *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
-   *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif
-@@ -172,13 +173,13 @@
-   *sw &= ~FPU_STATUS_FLAGS;
- #endif
- #if defined(__amd64__)
--  __uint16_t *cw = &uc->uc_mcontext.fpregs->cwd;
-+  u_int16_t *cw = &uc->uc_mcontext.fpregs->cwd;
-   *cw |= FPU_EXCEPTION_MASK;
- 
--  __uint16_t *sw = &uc->uc_mcontext.fpregs->swd;
-+  u_int16_t *sw = &uc->uc_mcontext.fpregs->swd;
-   *sw &= ~FPU_STATUS_FLAGS;
- 
--  __uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr;
-+  u_int32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr;
-   *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
-   *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif
-@@ -187,24 +188,24 @@
-   ucontext_t *uc = (ucontext_t *)context;
- 
- #if defined(__i386)
--  uint32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0];
-+  u_int32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0];
-   *cw |= FPU_EXCEPTION_MASK;
- 
--  uint32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1];
-+  u_int32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1];
-   *sw &= ~FPU_STATUS_FLAGS;
- 
-   /* address of the instruction that caused the exception */
--  uint32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3];
-+  u_int32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3];
-   uc->uc_mcontext.gregs[REG_PC] = *ip;
- #endif
- #if defined(__amd64__)
--  uint16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw;
-+  u_int16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw;
-   *cw |= FPU_EXCEPTION_MASK;
- 
--  uint16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw;
-+  u_int16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw;
-   *sw &= ~FPU_STATUS_FLAGS;
- 
--  uint32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr;
-+  u_int32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr;
-   *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
-   *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
- #endif
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch
index b0a6d4fbcc..86185870f0 100644
--- a/testing/firefox/fix-tools.patch
+++ b/testing/firefox/fix-tools.patch
@@ -1,5 +1,26 @@
---- mozilla-release.orig/tools/profiler/local_debug_info_symbolizer.cc
-+++ mozilla-release/tools/profiler/local_debug_info_symbolizer.cc
+diff --git a/tools/profiler/LulElf.cpp b/tools/profiler/LulElf.cpp
+index 203b15d..08a270a 100644
+--- a/tools/profiler/LulElf.cpp
++++ b/tools/profiler/LulElf.cpp
+@@ -612,10 +612,10 @@ 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);
++  // basename's behavior is less than ideal so avoid it
++  const char *c_filename = filename.c_str();
++  const char *p = strrchr(c_filename, '/');
++  string base = p ? p+1 : c_filename;
+   return base;
+ }
+ 
+diff --git a/tools/profiler/local_debug_info_symbolizer.cc b/tools/profiler/local_debug_info_symbolizer.cc
+index 2232130..41dabc8 100644
+--- a/tools/profiler/local_debug_info_symbolizer.cc
++++ b/tools/profiler/local_debug_info_symbolizer.cc
 @@ -3,6 +3,7 @@
   * License, v. 2.0. If a copy of the MPL was not distributed with this
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -8,19 +29,23 @@
  #include "PlatformMacros.h"
  #include "nsAutoPtr.h"
  
---- mozilla-release.orig/tools/profiler/platform-linux.cc
-+++ mozilla-release/tools/profiler/platform-linux.cc
-@@ -84,7 +84,7 @@
- 
- #define SIGNAL_SAVE_PROFILE SIGUSR2
+diff --git a/tools/profiler/platform-linux-lul.h b/tools/profiler/platform-linux-lul.h
+index 64714aa..563d8c0 100644
+--- a/tools/profiler/platform-linux-lul.h
++++ b/tools/profiler/platform-linux-lul.h
+@@ -18,7 +18,7 @@ logging_sink_for_LUL(const char* str);
  
+ // We need a definition of gettid(), but glibc doesn't provide a
+ // wrapper for it.
 -#if defined(__GLIBC__)
-+#if 1
- // glibc doesn't implement gettid(2).
++#if defined(__linux__)
+ #include <unistd.h>
  #include <sys/syscall.h>
- pid_t gettid()
---- mozilla-release.orig/tools/profiler/platform.h
-+++ mozilla-release/tools/profiler/platform.h
+ static inline pid_t gettid()
+diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
+index bb938a4..c721926 100644
+--- a/tools/profiler/platform.h
++++ b/tools/profiler/platform.h
 @@ -29,6 +29,8 @@
  #ifndef TOOLS_PLATFORM_H_
  #define TOOLS_PLATFORM_H_
@@ -30,20 +55,3 @@
  #ifdef ANDROID
  #include <android/log.h>
  #else
---- mozilla-release.orig/tools/profiler/LulElf.cpp
-+++ mozilla-release/tools/profiler/LulElf.cpp
-@@ -579,10 +579,10 @@
- // 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);
-+  // basename's behavior is less than ideal so avoid it
-+  const char *c_filename = filename.c_str();
-+  const char *p = strrchr(c_filename, '/');
-+  string base = p ? p+1 : c_filename;
-   return base;
- }
-