testing/firefox: upgrade to 42.0

5 files changed, 40 insertions, 77 deletions

diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index 5d591f5bbc..4ca1ed2bbf 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox
-pkgver=41.0.2
+pkgver=42.0
 _pkgver=$pkgver
 _xulver=$pkgver
 pkgrel=0
@@ -60,20 +60,19 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg
 	fix-toolkit.patch
 	fix-tools.patch
 	fix-seccomp-bpf.patch
-	getchar.patch
 	mozilla-build-arm.patch
-	stat.patch
 	stab.h
 
 	rhbz-966424.patch
 	fix-fortify-inline.patch
 	fix-fortify-system-wrappers.patch
 	allow-utf8-fallback.patch
+	libavutil.patch
 
 	firefox.desktop
 	firefox-safe.desktop"
 
-_builddir="${srcdir}/mozilla-release"
+_builddir="${srcdir}/firefox-$pkgver"
 _mozappdir=/usr/lib/firefox-$pkgver
 _mozappdirdev=/usr/lib/firefox-devel-$pkgver
 
@@ -167,57 +166,54 @@ dev() {
 	default_dev
 }
 
-md5sums="d71f0f761c51aeae03e367001afc9f8d  firefox-41.0.2.source.tar.xz
+md5sums="d610bf10a75afb4734045e1a43d8eba4  firefox-42.0.source.tar.xz
 1f4c60e662ed93784431bd06c5141719  mozconfig
 99b27aeac58923f318d083e5e71879ba  vendor.js
 6ab77b80c8c7d6fd07ab53c54561f4df  0002-Use-C99-math-isfinite.patch
 b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
 94ae976a54d1f84bf13d059c1e44ddf5  fix-toolkit.patch
-e64688ad989c22559bed2163dd4d908f  fix-tools.patch
+fe88db05a9a1adfd79babd137b0e8de8  fix-tools.patch
 aed3b88014fbfbe73db79851e52ca7fa  fix-seccomp-bpf.patch
-507742325de8687529e4e81e31132ddf  getchar.patch
 308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
-d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h
 15ebeeeb6823c185f4fed98e9bf1b786  rhbz-966424.patch
 f29e0036edc7b3a4158a82fa97bde500  fix-fortify-inline.patch
 9aba3811121f113fe547947591802d2b  fix-fortify-system-wrappers.patch
 1feef5ea2fd5acc2a71a29350754d006  allow-utf8-fallback.patch
+b8b2a3cdb38f402e4eb4885908233811  libavutil.patch
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
-sha256sums="ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e  firefox-41.0.2.source.tar.xz
+sha256sums="994a346699298277b64ec0cab72660b8d3e5b879a2ac79207576f7e6c33da3ae  firefox-42.0.source.tar.xz
 23c2b4535ce83c92ba978e15ce328c9f140def155d12523c00df30baf41b98dc  mozconfig
 afecb8c17a2bedafe600dd572d24eff24e540cda02f675705d11168040379ce6  vendor.js
 080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e  0002-Use-C99-math-isfinite.patch
 ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomics-grsec.patch
 195cc0b2008f6728e9d85ca787960bb47d7fba723e10d29e255baaa3bd5dd4dc  fix-toolkit.patch
-b05ab3f79d6f4c4e0b81db4279b4ef8bd65b9ecf8667d3711c73fafc83f25d8e  fix-tools.patch
+b7d43391006443da851c03546f2772ded7770a0ea045e8130be7011cf6718708  fix-tools.patch
 517d95225b3323c373c11da6ab867deb76ffdb0b50c1762bdd893abd9b39d4c9  fix-seccomp-bpf.patch
-d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
-a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
 a50d15a640f230a2c66e1eb2afd2bed4117605d0f1591dcfec1ca30f0bc2352f  rhbz-966424.patch
 ecf808ef1bc2920f6f7a4786fafb46c74e8a2c3bc628f28f10d6e8e1a265e609  fix-fortify-inline.patch
 cd19195cb4c316ad9f7d377cd8581218c888863b1bc4d112c97f48a4425fb946  fix-fortify-system-wrappers.patch
 a1ba79ec0c50c19edcfb24bb2686a718a77b02035e412989b9208b9b818abe14  allow-utf8-fallback.patch
+83113f1fbc0389602b3623e8a5428d41837c4ec9557615c37ca05619526a7404  libavutil.patch
 b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda  firefox.desktop
 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3  firefox-safe.desktop"
-sha512sums="700c1f355436747f8707b4086dfa0865c87ca7d1c3a5a879347e3460b26158681716addf085dc2446b1eeaccf328b3f3d6282df8e00cd97d8affd97dd780b409  firefox-41.0.2.source.tar.xz
+sha512sums="d38f48047233bf68929bd05276165266d341c0186214687405010cac7ccbb266618eec43849b05fa12358eb43a106494d8dce9683bae62e133b7f990bb4c8aaf  firefox-42.0.source.tar.xz
 e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5  mozconfig
 cc10dba32d9c7faf1d99b8fdebc71bf0200ad10b976105edb45df696bf64a668b2b7aa8c3892a8056eb71fb071b0e0ae51c3ce2fb75acfb7e7035104c0e4fce3  vendor.js
 7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
 4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
 d3f2ec8684aa485e1d08df325281629adb120f2e79c0065b96e14b99ca2968a3c701d18dda1fd1cab482aec2bc4ee8f294b9fda970ae159f8dab655f2c91aca9  fix-toolkit.patch
-fbd0e61b6a6cd656075e9b2bf30903ef33d2db09109811752b862ad50dbe3371346eaf0399ad16948f04d97827335ab4102be50d3532ef08ab37101ddc02070e  fix-tools.patch
+6322912a8b496332c593ee5c2069d346552299781148d6c829321a10be7f6550a6f7aab3d0cfeb08e1c4ecca2a79272ea7a6f31f1d2eb430c1b0041e3699c06c  fix-tools.patch
 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d  fix-seccomp-bpf.patch
-18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
-1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7  stat.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 06ededcd196af98b77991dcba3b710b0dfc061404adb4676fcc380be80410a2621f64d67257b0aefdf36f566e0ea1294b5405b7b4db43e83281a1c64d02da579  rhbz-966424.patch
 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
 2a967e4619fd89a046bd40be7fdcef646fcb1eba5e47afc96aa1d59c25bcc8747cb07baee6c11f3b803db0981aced181534b806778e4d21e74958f5f4d74c784  fix-fortify-system-wrappers.patch
 ebbc2b1336197c289e9b7c073d196fb5734e1dad0109fe70538f8089b1873e4b55305cd39cefcf95cd4eb36715be6dff298856c496616e935ff5579452e62b09  allow-utf8-fallback.patch
+2213dbd7eb36f954add09977c0bb979aea79376164bc98d7e8957ecf584776bc11cc88b6d8235f9e04ac69d5975a47c2f52fd9aff9076326f15997657af8c9f3  libavutil.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch
index 86185870f0..cf1589d633 100644
--- a/testing/firefox/fix-tools.patch
+++ b/testing/firefox/fix-tools.patch
@@ -1,7 +1,7 @@
 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
+--- a/tools/profiler/lul/LulElf.cpp
++++ b/tools/profiler/lul/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.
@@ -19,8 +19,8 @@ index 203b15d..08a270a 100644
  
 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
+--- a/tools/profiler/gecko/local_debug_info_symbolizer.cc
++++ b/tools/profiler/gecko/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/. */
@@ -29,11 +29,18 @@ index 2232130..41dabc8 100644
  #include "PlatformMacros.h"
  #include "nsAutoPtr.h"
  
-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);
+--- ./tools/profiler/core/platform.h.orig
++++ ./tools/profiler/core/platform.h
+@@ -34,6 +34,8 @@
+ #define MOZ_COUNT_DTOR(name)
+ #endif
+ 
++#include <sys/types.h>
++
+ #ifdef ANDROID
+ #include <android/log.h>
+ #else
+@@ -60,7 +62,7 @@
  
  // We need a definition of gettid(), but glibc doesn't provide a
  // wrapper for it.
@@ -42,16 +49,3 @@ index 64714aa..563d8c0 100644
  #include <unistd.h>
  #include <sys/syscall.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_
- 
-+#include <sys/types.h>
-+
- #ifdef ANDROID
- #include <android/log.h>
- #else
diff --git a/testing/firefox/getchar.patch b/testing/firefox/getchar.patch
deleted file mode 100644
index 981206b971..0000000000
--- a/testing/firefox/getchar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig
-+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
-@@ -21,6 +21,11 @@
- #include "constants.hpp"

- #include <cstring>

- 

-+/* prevent the getchar macro from stdio to take preference over the local var */

-+#if defined(__UCLIBC__)

-+#undef getchar

-+#endif

-+

- namespace boost {

-   namespace detail {

-   	//This only works on unsigned data types

diff --git a/testing/firefox/libavutil.patch b/testing/firefox/libavutil.patch
new file mode 100644
index 0000000000..ba1e1a2457
--- /dev/null
+++ b/testing/firefox/libavutil.patch
@@ -0,0 +1,12 @@
+diff --git a/media/libav/libavutil/cpu.c b/media/libav/libavutil/cpu.c
+index 354d21e..6a44cea 100644
+--- a/media/libav/libavutil/cpu.c
++++ b/media/libav/libavutil/cpu.c
+@@ -36,7 +36,6 @@
+ #include <sys/param.h>
+ #endif
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #endif
+ #if HAVE_SYSCONF
+ #include <unistd.h>
diff --git a/testing/firefox/stat.patch b/testing/firefox/stat.patch
deleted file mode 100644
index ed7dc007e2..0000000000
--- a/testing/firefox/stat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ./dom/system/OSFileConstants.cpp.orig	2013-04-17 06:17:29.798371189 +0000
-+++ ./dom/system/OSFileConstants.cpp	2013-04-17 06:30:30.032285977 +0000
-@@ -509,6 +509,11 @@
-   INT_CONSTANT(_STAT_VER),
- #endif // defined(_STAT_VER)
- 
-+  // glibc's stat/lstat/fstat are macros while uclibc's are not
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
-+   { "OSFILE_STAT_MACROS", INT_TO_JSVAL(1) },
-+#endif // defined(stat)
-+
-   PROP_END
- };
- 
---- ./toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2014-04-03 13:08:26.686409787 +0000
-+++ ./toolkit/components/osfile/modules/osfile_unix_back.jsm	2014-04-03 13:34:14.101716259 +0000
-@@ -512,7 +512,7 @@
-                       /*path*/   Type.fd,
-                       /*buf*/    Type.stat.out_ptr
-                      );
--       } else if (Const._STAT_VER != undefined) {
-+       } else if (Const.OSFILE_STAT_MACROS != undefined) {
-          const ver = Const._STAT_VER;
-          let xstat_name, lxstat_name, fxstat_name;
-          if (OS.Constants.Sys.Name == "SunOS") {