mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 20:06:43 +02:00
testing/firefox: upgrade to 69.0.1, enable build on aarch64
Not too familiar with rust, Void's version of fix-third_party.patch might be cleaner or more portable:3a3d0ef781/srcpkgs/firefox/patches/initialize_sched_param.patchAlso this change updates the checksum of rt_linux.rs used by cargo for validation, whereas they disable checksumming entirely:3a3d0ef781/srcpkgs/firefox/template (L42)
This commit is contained in:
Ivan Delalande
Rasmus Thomsen
parent
4a50f6d7f1
commit
ac320fc40b
@ -1,12 +1,12 @@
|
||||
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=firefox
|
||||
pkgver=68.0.2
|
||||
pkgver=69.0.1
|
||||
pkgrel=0
|
||||
pkgdesc="Firefox web browser"
|
||||
url="https://www.firefox.com/"
|
||||
# limited by rust and cargo
|
||||
arch="x86_64"
|
||||
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
|
||||
@ -59,10 +59,10 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkg
|
||||
mallinfo.patch
|
||||
|
||||
disable-moz-stackwalk.patch
|
||||
fix-musl.patch
|
||||
fix-rust-target.patch
|
||||
fix-webrtc-glibcisms.patch
|
||||
fix-sandbox-membarrier.patch
|
||||
fix-third_party.patch
|
||||
|
||||
firefox.desktop
|
||||
firefox-safe.desktop"
|
||||
@ -96,11 +96,17 @@ build() {
|
||||
# set rpath so linker finds the libs
|
||||
export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}"
|
||||
|
||||
case "$CARCH" in
|
||||
x86_64)
|
||||
# disable-elf-hack: exists only on arm, x86, x86_64
|
||||
_arch_config="--disable-elf-hack"
|
||||
;;
|
||||
esac
|
||||
|
||||
../configure \
|
||||
--prefix=/usr \
|
||||
\
|
||||
$_arch_config \
|
||||
--disable-crashreporter \
|
||||
--disable-elf-hack \
|
||||
--disable-gold \
|
||||
--disable-install-strip \
|
||||
--disable-jemalloc \
|
||||
@ -109,7 +115,6 @@ build() {
|
||||
--disable-strip \
|
||||
--disable-tests \
|
||||
--disable-updater \
|
||||
\
|
||||
--enable-alsa \
|
||||
--enable-default-toolkit=cairo-gtk3-wayland \
|
||||
--enable-official-branding \
|
||||
@ -120,7 +125,6 @@ build() {
|
||||
--enable-ffmpeg \
|
||||
--enable-hardening \
|
||||
--enable-rust-simd \
|
||||
\
|
||||
--with-system-bz2 \
|
||||
--with-system-icu \
|
||||
--with-system-libevent \
|
||||
@ -189,7 +193,7 @@ __EOF__
|
||||
rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
|
||||
}
|
||||
|
||||
sha512sums="5c289825fd0de062b9943eabcc16e09c1821c04717e689aa8df03162e722b72ea698195f3ea93e1e746c481dacd77d125301dba951468d134b986e35eb4ef5bb firefox-68.0.2.source.tar.xz
|
||||
sha512sums="89e63eb882cd729f938fef3cb0565cf166b14fa8c4e34ff027f3f6ea0469e4a49706074259013c1cea66f7a3f6f46aead8e055049d542935ddca983ac172b93f firefox-69.0.1.source.tar.xz
|
||||
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h
|
||||
2f4f15974d52de4bb273b62a332d13620945d284bbc6fe6bd0a1f58ff7388443bc1d3bf9c82cc31a8527aad92b0cd3a1bc41d0af5e1800e0dcbd7033e58ffd71 fix-fortify-system-wrappers.patch
|
||||
84b84d2d7dbc16002510bf856796ad345ac38ef6d3254670230189bba7c2d4781714d231236d5a3d70129a4597b430c3171644b01ad0f5a5bb13b55d407337a4 fix-seccomp-bpf.patch
|
||||
@ -197,9 +201,9 @@ sha512sums="5c289825fd0de062b9943eabcc16e09c1821c04717e689aa8df03162e722b72ea698
|
||||
4d55f41d15be7457ad630f8f07e4fc0314c2f75720010b4bbe6a2a7f3228210a1e069949e11795efbe2e784b0762e79fdfe5b8ec38e8a64cb8d9cf3b57dd5af1 fix-tools.patch
|
||||
a4a3e062661bda64d502d426c480ac9645345860118de9df9ffe6e0597738c70c11e5cdef2d4fd12c5e2ee30a09310159230524655a419a4f7e4eeeb0f3c06b0 mallinfo.patch
|
||||
454ea3263cabce099accbdc47aaf83be26a19f8b5a4568c01a7ef0384601cf8315efd86cd917f9c8bf419c2c845db89a905f3ff9a8eb0c8e41042e93aa96a85c disable-moz-stackwalk.patch
|
||||
e0df4fc649012f023443ce9165da29d36459dbca5df64a31008b28d96264fba909858de36d0cf1b1cb1aab898342413f0cd77c90ebe21d1f9a0504631d6d1d0e fix-musl.patch
|
||||
676c47e3dc25b059a2efcc7bbb0e7748be7f8a908d1ed6c4d81a0930a35ed28566bdc738b84e13fd11c0e7f07ab1a1969caa06b3acf9b95002eb6b3beb30b82c fix-rust-target.patch
|
||||
d35cacb9ede80e6bfbef0709823e536dddfb1c02d776275b0b7adb5969e9927d8c6117df96873569c3f3db0a18ee5db24f8086a9311a05077892be43a3dd8d79 fix-webrtc-glibcisms.patch
|
||||
f85f2c19c3dafab915bcb40e580fc442fd9eab5916696849edf0b105c758dd807dfe23a6479935613c81496711eb377c73227c03eb8582204c3442a4d0e397a2 fix-sandbox-membarrier.patch
|
||||
a2491548937f42331217cb8b6ef0bcc5fca320081e5523b2d3d3e1799b1930fae65dfc669499c190d92d82bf9ed29894daced13325e25e4a8e66757af8d37699 fix-third_party.patch
|
||||
f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop
|
||||
5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/tools/profiler/core/platform-linux-android.cpp 2019-07-09 22:58:30.039475686 +0200
|
||||
+++ b/tools/profiler/core/platform-linux-android.cpp 2019-07-09 22:58:39.331437677 +0200
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
int profiler_current_thread_id() {
|
||||
// glibc doesn't provide a wrapper for gettid().
|
||||
-#if defined(__GLIBC__)
|
||||
+#if defined(__linux__)
|
||||
return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
|
||||
#else
|
||||
return static_cast<int>(gettid());
|
||||
@ -1,10 +1,12 @@
|
||||
--- a/build/moz.configure/rust.configure
|
||||
+++ b/build/moz.configure/rust.configure
|
||||
@@ -280,9 +280,11 @@
|
||||
@@ -280,9 +280,13 @@
|
||||
die("Don't know how to translate {} for rustc".format(
|
||||
host_or_target.alias))
|
||||
|
||||
+ fixed_alias = rustc_target.alias.replace("-unknown-", "-alpine-").replace("-gnu", "-musl")
|
||||
+ fixed_alias = rustc_target.alias.replace("-gnu", "-musl")
|
||||
+ if host_or_target.cpu != 'aarch64':
|
||||
+ fixed_alias = fixed_alias.replace("-unknown-", "-alpine-")
|
||||
+
|
||||
# Check to see whether our rustc has a reasonably functional stdlib
|
||||
# for our chosen target.
|
||||
@ -13,7 +15,7 @@
|
||||
in_fd, in_path = mkstemp(prefix='conftest', suffix='.rs')
|
||||
out_fd, out_path = mkstemp(prefix='conftest', suffix='.rlib')
|
||||
os.close(out_fd)
|
||||
@@ -319,7 +321,7 @@
|
||||
@@ -319,7 +323,7 @@
|
||||
os.remove(out_path)
|
||||
|
||||
# This target is usable.
|
||||
|
||||
22
testing/firefox/fix-third_party.patch
Normal file
22
testing/firefox/fix-third_party.patch
Normal file
@ -0,0 +1,22 @@
|
||||
--- a/third_party/rust/audio_thread_priority/src/rt_linux.rs
|
||||
+++ b/third_party/rust/audio_thread_priority/src/rt_linux.rs
|
||||
@@ -94,7 +94,12 @@
|
||||
let thread_id = unsafe { libc::syscall(libc::SYS_gettid) };
|
||||
let pthread_id = unsafe { libc::pthread_self() };
|
||||
let mut policy = 0;
|
||||
- let mut param = libc::sched_param { sched_priority: 0 };
|
||||
+ let mut param = libc::sched_param { sched_priority: 0,
|
||||
+ sched_ss_init_budget: libc::timespec { tv_nsec: 0, tv_sec: 0 },
|
||||
+ sched_ss_low_priority: 0,
|
||||
+ sched_ss_max_repl: 0,
|
||||
+ sched_ss_repl_period: libc::timespec { tv_nsec: 0, tv_sec: 0 },
|
||||
+ };
|
||||
|
||||
if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 {
|
||||
error!("pthread_getschedparam error {}", pthread_id);
|
||||
--- a/third_party/rust/audio_thread_priority/.cargo-checksum.json
|
||||
+++ b/third_party/rust/audio_thread_priority/.cargo-checksum.json
|
||||
@@ -1 +1 @@
|
||||
-{"files":{"Cargo.toml":"4c85ca3ce6ee93571667a430f548a1c9e73cfa621b2dac9fffa35bf280a90d9e","Makefile":"8c6b9e8afffb14ae03f9cd95bc7d6011c8b4fe01c474aef17360e3f0c4d202ad","README.md":"bcfa4948edf52fdacd485200a0c1c886a92232cc1931eeb4e1044050f46ec253","audio_thread_priority.h":"880889a154283a87cf84218cc4d6b2b9dd2c8fd09adc6d38f527b08ccd0c6168","generate_osx_bindings.sh":"06e4e03450f788ced18d31fff5660919e6f6ec1119ddace363ffeb82f0518a71","src/lib.rs":"d1e04bc2901472ce98be1a79b6844b49e38598eda3e4f8c0e7b08c5b33247375","src/mach_sys.rs":"352560fcb9b41d877cff92e5b3b04d6dc68b1f30508ce4b9aed78940120a883e","src/rt_linux.rs":"238264f4a3e010743ea2f44b3b13cb912f2b57786cd97e583575415d7e84b6b2","src/rt_mach.rs":"381f709a59d21031caf70e1bf4e9c26cd25fd3d2618ae0d91c1fbc236ce519ca","src/rt_win.rs":"f8f5b7af21cadd686cf7d8099d1972d3265c3889574020bd4ea088b832fbfa51"},"package":"047460864ea9f62fbdfb80fc04a2e5d844aef9e50727e6e9730ca58d9f1a9267"}
|
||||
\ No newline at end of file
|
||||
+{"files":{"Cargo.toml":"4c85ca3ce6ee93571667a430f548a1c9e73cfa621b2dac9fffa35bf280a90d9e","Makefile":"8c6b9e8afffb14ae03f9cd95bc7d6011c8b4fe01c474aef17360e3f0c4d202ad","README.md":"bcfa4948edf52fdacd485200a0c1c886a92232cc1931eeb4e1044050f46ec253","audio_thread_priority.h":"880889a154283a87cf84218cc4d6b2b9dd2c8fd09adc6d38f527b08ccd0c6168","generate_osx_bindings.sh":"06e4e03450f788ced18d31fff5660919e6f6ec1119ddace363ffeb82f0518a71","src/lib.rs":"d1e04bc2901472ce98be1a79b6844b49e38598eda3e4f8c0e7b08c5b33247375","src/mach_sys.rs":"352560fcb9b41d877cff92e5b3b04d6dc68b1f30508ce4b9aed78940120a883e","src/rt_linux.rs":"e907a8ab6c5d16d7ac37c26ab55f7a0226d3a8989060cf8a3fceef4285280fc4","src/rt_mach.rs":"381f709a59d21031caf70e1bf4e9c26cd25fd3d2618ae0d91c1fbc236ce519ca","src/rt_win.rs":"f8f5b7af21cadd686cf7d8099d1972d3265c3889574020bd4ea088b832fbfa51"},"package":"047460864ea9f62fbdfb80fc04a2e5d844aef9e50727e6e9730ca58d9f1a9267"}
|
||||
Loading…
x
Reference in New Issue
Block a user