Skip to content

Commit

Permalink
firefox: update to 87.0.
Browse files Browse the repository at this point in the history
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: rust-minidump/minidump-writer#4
  • Loading branch information
ericonr authored and Yassine Labidi committed Mar 27, 2021
1 parent 479e1cd commit 2893ef8
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 23 deletions.
34 changes: 34 additions & 0 deletions 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
21 changes: 0 additions & 21 deletions srcpkgs/firefox/patches/rust-has-i128.patch

This file was deleted.

4 changes: 2 additions & 2 deletions srcpkgs/firefox/template
Expand Up @@ -3,15 +3,15 @@
# 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"
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

Expand Down

0 comments on commit 2893ef8

Please sign in to comment.