diff --git a/community/firefox/APKBUILD b/community/firefox/APKBUILD index 4e966dc383e..c70f233752c 100644 --- a/community/firefox/APKBUILD +++ b/community/firefox/APKBUILD @@ -5,7 +5,7 @@ pkgname=firefox pkgver=120.0.1 _releasedate=2023-11-30 -pkgrel=0 +pkgrel=1 pkgdesc="Firefox web browser" url="https://www.firefox.com/" # s390x blocked by lld @@ -77,6 +77,7 @@ riscv64) ;; esac source="$pkgname-$pkgver.tar.xz::https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz audio-lfs64.patch + crash-reporting-ptrace.patch disable-moz-stackwalk.patch fix-fortify-system-wrappers.patch fix-rust-target.patch @@ -529,7 +530,6 @@ prepare() { # disable unwanted things ac_add_options --disable-bootstrap ac_add_options --disable-cargo-incremental - ac_add_options --disable-crashreporter ac_add_options --disable-debug ac_add_options --disable-debug-symbols ac_add_options --disable-install-strip @@ -584,6 +584,14 @@ prepare() { # these are for alpine linux use only ac_add_options --with-mozilla-api-keyfile="$builddir/mozilla-api-key" EOF + + case "$CARCH" in + x86|armv7) + # x86: https://github.com/rust-lang/libc/issues/3476 + # armv7: error: unknown type name 'fpregset_t' + echo "ac_add_options --disable-crash-reporting" >> base-mozconfig + ;; + esac } build() { @@ -746,6 +754,7 @@ intl() { sha512sums=" dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c firefox-120.0.1.tar.xz 3e0501ae7a650346c667dfdc0ae0ca286084f22e89ab2ac671cc0d7315673dc5b6dcb9f9882f6f39d26e9a31e57f7a0fd53d6b805e520224e22b8976850e2eb8 audio-lfs64.patch +0f7b741ea2fd492bc50256f3fcbd46c09e92211ad7a943474de99729245eddd063e4eca16a8e9a2d6919bfcfc81b739c6aa7b3463469608ebd4cb1e24d26abc1 crash-reporting-ptrace.patch 454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch 2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch cd68b89e29e5f6379fbd5679db27b9a5ef70ea65e51c0d0a8137e1f1fd210e35a8cfb047798e9549bc7275606d7ec5c8d8af1335d29da4699db7acd8bc7ff556 fix-rust-target.patch diff --git a/community/firefox/crash-reporting-ptrace.patch b/community/firefox/crash-reporting-ptrace.patch new file mode 100644 index 00000000000..be06ed9419b --- /dev/null +++ b/community/firefox/crash-reporting-ptrace.patch @@ -0,0 +1,16 @@ +diff --git a/toolkit/crashreporter/mozannotation_server/src/process_reader/linux.rs b/toolkit/crashreporter/mozannotation_server/src/process_reader/linux.rs +index db6dbd3..c8682ce 100644 +--- a/toolkit/crashreporter/mozannotation_server/src/process_reader/linux.rs ++++ b/toolkit/crashreporter/mozannotation_server/src/process_reader/linux.rs +@@ -261,8 +261,10 @@ enum PTraceOperation { + PeekData, + } + +-#[cfg(target_os = "linux")] ++#[cfg(all(target_os = "linux", target_env = "gnu"))] + type PTraceOperationNative = libc::c_uint; ++#[cfg(all(target_os = "linux", target_env = "musl"))] ++type PTraceOperationNative = libc::c_int; + #[cfg(target_os = "android")] + type PTraceOperationNative = c_int; +