From 2893ef8f88429c2ae303618b61d53ad4f53687b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Wed, 24 Mar 2021 09:59:36 -0300
Subject: [PATCH] firefox: update to 87.0.

minidump_writer_linux has issues on musl and doesn't support all
platforms Void does (thread_info doesn't touch ppc*), so we add a patch
to not build it at all. It seems to be a build system bug where
oxidized_breakpad can be enabled even when --disable-backtrace is set.
If next version still only enables it for x86_64, it might build/work
fine for us, see: https://github.com/msirringhaus/minidump_writer_linux/issues/4
---
 .../firefox/patches/disable-minidump.patch    | 34 +++++++++++++++++++
 srcpkgs/firefox/patches/rust-has-i128.patch   | 21 ------------
 srcpkgs/firefox/template                      |  4 +--
 3 files changed, 36 insertions(+), 23 deletions(-)
 create mode 100644 srcpkgs/firefox/patches/disable-minidump.patch
 delete mode 100644 srcpkgs/firefox/patches/rust-has-i128.patch

diff --git a/srcpkgs/firefox/patches/disable-minidump.patch b/srcpkgs/firefox/patches/disable-minidump.patch
new file mode 100644
index 00000000000000..55f67c5d39b7ed
--- /dev/null
+++ b/srcpkgs/firefox/patches/disable-minidump.patch
@@ -0,0 +1,34 @@
+Enables itself even when --disable-backtrace is set,
+and doesn't build on musl or ppc* (not tested).
+
+diff --git Cargo.toml Cargo.toml
+index 4076a60577..945f26f638 100644
+--- Cargo.toml
++++ Cargo.toml
+@@ -13,7 +13,6 @@ members = [
+   "netwerk/test/http3server",
+   "security/manager/ssl/osclientcerts",
+   "testing/geckodriver",
+-  "toolkit/crashreporter/rust_minidump_writer_linux",
+   "toolkit/library/gtest/rust",
+   "toolkit/library/rust/",
+   "toolkit/mozapps/defaultagent/rust",
+@@ -79,7 +78,6 @@ spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4" }
+ # failure's backtrace feature might break our builds, see bug 1608157.
+ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
+-minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "9191af36343846b2c7ada65b9602b481b717c4d8" }
+ 
+ [patch.crates-io.cranelift-codegen]
+ git = "https://github.com/mozilla-spidermonkey/wasmtime"
+diff --git toolkit/moz.configure toolkit/moz.configure
+index 806576b1ef..43ef8309f1 100644
+--- toolkit/moz.configure
++++ toolkit/moz.configure
+@@ -2487,8 +2487,6 @@ set_define("MOZ_USE_NATIVE_POPUP_WINDOWS", True, when="MOZ_USE_NATIVE_POPUP_WIND
+ # ==============================================================
+ @depends(target)
+ def oxidized_breakpad(target):
+-    if target.kernel == "Linux" and target.os != "Android":
+-        return target.cpu in ("x86", "x86_64")
+     return False
diff --git a/srcpkgs/firefox/patches/rust-has-i128.patch b/srcpkgs/firefox/patches/rust-has-i128.patch
deleted file mode 100644
index 4c90cd3d1061fd..00000000000000
--- a/srcpkgs/firefox/patches/rust-has-i128.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-The configure check fails for cross builds.
-i128 is supported since rust-1.26, so it is safe for us to assume it is always present
-
---- third_party/rust/num-traits/build.rs.orig	2020-02-14 23:57:25.985355610 +0100
-+++ third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
-@@ -1,14 +1,5 @@
--extern crate autocfg;
--
--use std::env;
--
- fn main() {
--    let ac = autocfg::new();
--    if ac.probe_type("i128") {
--        println!("cargo:rustc-cfg=has_i128");
--    } else if env::var_os("CARGO_FEATURE_I128").is_some() {
--        panic!("i128 support was not detected!");
--    }
-+    println!("cargo:rustc-cfg=has_i128");
- 
-     autocfg::rerun_path("build.rs");
- }
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 789de2945b9383..0fd5d573c483ee 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,7 +3,7 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
 #
 pkgname=firefox
-version=86.0.1
+version=87.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=74f99c226ae6747f0170566f4f88be410866b0120214d2a593566cd1fff3d3df
+checksum=ce98be0522f971b6950f22c738c4b2caf19cf7f48ab2ae2e6d46694af7fd58ab
 
 lib32disabled=yes