testing/firefox: upgrade to 60.0.1

5 files changed, 40 insertions, 33 deletions

diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index 8a2b56b540..1e6ae7b7c0 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=58.0.1
+pkgver=60.0.1
 _pkgver=$pkgver
 _xulver=$pkgver
-pkgrel=2
+pkgrel=0
 pkgdesc="Firefox web browser"
 url="http://www.firefox.com"
 # limited by rust and cargo
@@ -70,14 +70,14 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg
 	disable-moz-stackwalk.patch
 	fix-rust-target.patch
 	fix-bug-1261392.patch
-	servo-allow-unused-imports.patch
-	fix-sandbox-alsa.patch
+	rust-unitialized-field.patch
+	fix-webrtc-glibcisms.patch
 
 	firefox.desktop
 	firefox-safe.desktop"
 
 builddir="${srcdir}/firefox-$pkgver"
-_mozappdir=/usr/lib/firefox-$pkgver
+_mozappdir=/usr/lib/firefox
 
 # help our shared-object scanner to find the libs
 ldpath="$_mozappdir"
@@ -217,7 +217,7 @@ __EOF__
 	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
 }
 
-sha512sums="65a6a68f95dac93fc68c4e240742b172a6417e7fafca2671ab13f398329ba0ef3195bbaaecea2d9f8b2992217cfaa7912af6c0351a1efe4cf2d2bba838ecd711  firefox-58.0.1.source.tar.xz
+sha512sums="160fe83fc9101930521bdefefa8e32458a7438f454114aa5b1206ab4f63ce89566d84d4b7aca4c2c8d4fda529b33e29aa8a5228a643961e4b3e09b18d0c13510  firefox-60.0.1.source.tar.xz
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71  fix-fortify-system-wrappers.patch
 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
@@ -232,7 +232,7 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1
 4797d2d89ac63a57abb826b8ea9f751314ce66946194033deb9d78c2ff377b88106fd2c7bc5034dc13ad03dd5085b1893c3ccae1a9e63fde35655bb0921f7188  disable-moz-stackwalk.patch
 42cc44fda4b05259b38f055d6f51461746aa89a474cedc5e92fb9d20879da0d12b1b515b273a549e7302cda9c7eddde20d5fdba09853e5c658784ad6d0b20078  fix-rust-target.patch
 a50b412edf9573a0bd04a43578b1c927967a616b73a5995eefb15bfa78fd2bd14e36ec05315a0703f6370ecd524e6bcb012e7285beb1245e9add9b8553acb79e  fix-bug-1261392.patch
-7fcdda2028edbcf099ea8b88811d08f298740f86ec1ebef2c81aaa62f63a73f1a710b3756f7b6a42bdbc2b147e74d2f2e74a65c96604205029f7d1d8250954da  servo-allow-unused-imports.patch
-c467d9f69c864b53840424341b7790a9757701189137fbcab8d5e2cfc039ae870090adde070abe45d7d9a19ef11a69b2dd3064b6a13f5d1af8964b1cdf440fed  fix-sandbox-alsa.patch
+01b48a708cc6bc6e3cd7cc7b16f5137ec344566ac891d699b65e322bc992726072fa14a54cef1a7775799fcbbcf90a6c170107c8524caba3bc311b42d93b7581  rust-unitialized-field.patch
+75b97d59e81e5f1debe6a459b535da704d5a2ac4a57c446d16058fd18db81e22317fcc3ec11b89f569f4de87e8e80ced027c0e72e7f1dd16f6fd0feb6b263919  fix-webrtc-glibcisms.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/testing/firefox/fix-sandbox-alsa.patch b/testing/firefox/fix-sandbox-alsa.patch
deleted file mode 100644
index 364e73318b..0000000000
--- a/testing/firefox/fix-sandbox-alsa.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./security/sandbox/linux/moz.build.orig
-+++ ./security/sandbox/linux/moz.build
-@@ -77,6 +77,9 @@
-         'SandboxOpenedFiles.cpp',
-     ]
- 
-+if CONFIG['MOZ_ALSA']:
-+    DEFINES['MOZ_ALSA'] = True
-+
- # This copy of SafeSPrintf doesn't need to avoid the Chromium logging
- # dependency like the one in libxul does, but this way the behavior is
- # consistent.  See also the comment in SandboxLogging.h.
diff --git a/testing/firefox/fix-webrtc-glibcisms.patch b/testing/firefox/fix-webrtc-glibcisms.patch
new file mode 100644
index 0000000000..dc9206b50e
--- /dev/null
+++ b/testing/firefox/fix-webrtc-glibcisms.patch
@@ -0,0 +1,13 @@
+--- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2018-05-09 23:48:44.677389171 +0200
++++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2018-05-09 23:48:56.254373557 +0200
+@@ -11,7 +11,9 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <features.h>
+-#if __GLIBC_PREREQ(2, 16)
++#if !defined(__GLIBC__)
++#include <sys/auxv.h>
++#elif __GLIBC_PREREQ(2, 16)
+ #include <sys/auxv.h>
+ #else
+ #include <fcntl.h>
diff --git a/testing/firefox/rust-unitialized-field.patch b/testing/firefox/rust-unitialized-field.patch
new file mode 100644
index 0000000000..67ef3a02ab
--- /dev/null
+++ b/testing/firefox/rust-unitialized-field.patch
@@ -0,0 +1,19 @@
+--- ./media/audioipc/audioipc/src/cmsg.rs.orig	2018-05-09 22:19:14.748631939 +0200
++++ ./media/audioipc/audioipc/src/cmsg.rs	2018-05-09 22:19:22.961620862 +0200
+@@ -106,11 +106,11 @@ impl ControlMsgBuilder {
+                 return Err(Error::NoSpace);
+             }
+ 
+-            let cmsghdr = cmsghdr {
+-                cmsg_len: cmsg_len as _,
+-                cmsg_level: level,
+-                cmsg_type: kind,
+-            };
++            use std::mem;
++            let mut cmsghdr: cmsghdr =  unsafe { mem::zeroed() };
++            cmsghdr.cmsg_len = cmsg_len as _;
++            cmsghdr.cmsg_level = level;
++            cmsghdr.cmsg_type = kind;
+ 
+             let cmsghdr = unsafe {
+                 slice::from_raw_parts(&cmsghdr as *const _ as *const _, mem::size_of::<cmsghdr>())
diff --git a/testing/firefox/servo-allow-unused-imports.patch b/testing/firefox/servo-allow-unused-imports.patch
deleted file mode 100644
index 3c7f2e026a..0000000000
--- a/testing/firefox/servo-allow-unused-imports.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/servo/components/style/values/specified/font.rs b/servo/components/style/values/specified/font.rs
-index da2fa94..3ceab11 100644
---- a/servo/components/style/values/specified/font.rs
-+++ b/servo/components/style/values/specified/font.rs
-@@ -11,7 +11,7 @@ use cssparser::{Parser, Token};
- use parser::{Parse, ParserContext};
- use properties::longhands::system_font::SystemFont;
- #[allow(unused_imports)]
--use std::ascii::AsciiExt;
-+#[allow(unused_imports)] use std::ascii::AsciiExt;
- use std::fmt;
- use style_traits::{ToCss, StyleParseErrorKind, ParseError};
- use values::CustomIdent;