testing/firefox: upgrade to 71.0

reenable
add rust_audio-thread-priority.patch from Void linux
fix-third_party.patch
use python2 not python2-dev in makedepends

3 files changed, 46 insertions, 29 deletions

diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index ce450fc022..56b58af422 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -1,13 +1,11 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox
-pkgver=70.0.1
-pkgrel=1
+pkgver=71.0
+pkgrel=0
 pkgdesc="Firefox web browser"
 url="https://www.firefox.com/"
-# arch="x86_64 armhf aarch64 x86 ppc64le" # limited by rust and cargo, build failure on armv7
-# arch="x86_64 aarch64"
-arch="" # Firefox building fails on newer rust
+arch="x86_64 aarch64"
 license="GPL-3.0-only AND LGPL-2.1-only AND LGPL-3.0-only AND MPL-2.0"
 makedepends="
 	alsa-lib-dev
@@ -41,7 +39,7 @@ makedepends="
 	nspr-dev
 	nss-dev>=3.44.1
 	nss-static
-	python2-dev
+	python2
 	sqlite-dev
 	sed
 	startup-notification-dev
@@ -63,7 +61,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg
 	fix-rust-target.patch
 	fix-webrtc-glibcisms.patch
 	fix-sandbox-membarrier.patch
-	fix-third_party.patch
+	rust_audio-thread-priority.patch
 
 	firefox.desktop
 	firefox-safe.desktop"
@@ -239,7 +237,7 @@ __EOF__
 	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
 }
 
-sha512sums="798e18620e50ef10f184b6e43c88cfbad8a446ae005204582bccc2958107910617375b0ff622c85fb768b48d490a31ea7674eef9f0c415aa72cd958f09a9f725  firefox-70.0.1.source.tar.xz
+sha512sums="2f60bb7513dc2e730d8d558faad30367e12d27cb24b630aaebeb0473d0a202a3d4838b253d631722d57fb26f54145e296a710ec1714d3ba27dd71c6c1c52e920  firefox-71.0.source.tar.xz
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71  fix-fortify-system-wrappers.patch
 84b84d2d7dbc16002510bf856796ad345ac38ef6d3254670230189bba7c2d4781714d231236d5a3d70129a4597b430c3171644b01ad0f5a5bb13b55d407337a4  fix-seccomp-bpf.patch
@@ -250,6 +248,6 @@ a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12
 089c97e6011e86a9b9d9e7b0c8ba3af0519d1ce4e2b1e9ab7719762d6968388bfa47dad3bf23a6d41c3d66fdcc6c15e2c926e3ff9500bfd4fbf1b53e6d19dc57  fix-rust-target.patch
 d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79  fix-webrtc-glibcisms.patch
 f85f2c19c3dafab915bcb40e580fc442fd9eab5916696849edf0b105c758dd807dfe23a6479935613c81496711eb377c73227c03eb8582204c3442a4d0e397a2  fix-sandbox-membarrier.patch
-eef94b3dd4cd04ea2ffab71764f15cc7cbb3cfe68175aef37805ffd660f6dff3de97d736cf3c76d19633406b84efdac7bfe8d68cce6da2528e74f313bef05943  fix-third_party.patch
+18098bae18ce9ead6bca0d93d28e634495fa08a4c0707057f72a9e34205a64a0ce5ab98a4cfc2d492412725b14447eb9553b2976d9620c3d71eba2135c6ba211  rust_audio-thread-priority.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/testing/firefox/fix-third_party.patch b/testing/firefox/fix-third_party.patch
deleted file mode 100644
index 7cba6e0c90..0000000000
--- a/testing/firefox/fix-third_party.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/third_party/rust/audio_thread_priority/src/rt_linux.rs.orig	2019-10-24 07:52:22.690223829 +0200
-+++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-10-24 07:53:24.586418407 +0200
-@@ -100,7 +100,7 @@
-     let mut policy = 0;
- 
-     if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
--        error!("pthread_getschedparam error {}", pthread_id);
-+        error!("pthread_getschedparam error");
-         return Err(());
-     }
- 
-@@ -127,7 +127,7 @@
-     if unsafe { libc::pthread_setschedparam(rt_priority_handle.pthread_id,
-                                             rt_priority_handle.policy,
-                                             &rt_priority_handle.param) } < 0 {
--        warn!("could not demote thread {}", rt_priority_handle.pthread_id);
-+        warn!("could not demote thread");
-         return Err(());
-     }
-     return Ok(());
diff --git a/testing/firefox/rust_audio-thread-priority.patch b/testing/firefox/rust_audio-thread-priority.patch
new file mode 100644
index 0000000000..e3c64ddbbe
--- /dev/null
+++ b/testing/firefox/rust_audio-thread-priority.patch
@@ -0,0 +1,39 @@
+backport of https://github.com/padenot/audio_thread_priority/commit/b5b86285d3c0cae2cb731730460f386ffa30cb03.patch
+avoids problems with serialization of RtPriorityThreadInfo in media/audioipc on musl
+
+--- a/third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-12-02 13:24:01.000000000 +0100
++++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs	2019-12-02 13:24:01.000000000 +0100
+@@ -31,9 +31,7 @@
+     /// process.
+     pthread_id: libc::pthread_t,
+     /// ...
+-    policy: libc::c_int,
+-    /// ...
+-    param: libc::sched_param,
++    policy: libc::c_int
+ }
+ 
+ impl RtPriorityThreadInfoInternal {
+@@ -141,9 +139,11 @@
+                                             -> Result<(), ()> {
+     assert!(unsafe { libc::pthread_self() } == rt_priority_handle.thread_info.pthread_id);
+ 
++    let param = unsafe { std::mem::zeroed::<libc::sched_param>() };
++
+     if unsafe { libc::pthread_setschedparam(rt_priority_handle.thread_info.pthread_id,
+                                             rt_priority_handle.thread_info.policy,
+-                                            &rt_priority_handle.thread_info.param) } < 0 {
++                                            &param) } < 0 {
+         error!("could not demote thread {}", OSError::last_os_error().raw_os_error().unwrap());
+         return Err(());
+     }
+@@ -187,8 +187,7 @@
+         pid,
+         thread_id,
+         pthread_id,
+-        policy,
+-        param
++        policy
+     })
+ }
+