diff --git a/srcpkgs/firefox/patches/format_warning.patch b/srcpkgs/firefox/patches/format_warning.patch new file mode 100644 index 0000000000..c2b4c6332a --- /dev/null +++ b/srcpkgs/firefox/patches/format_warning.patch @@ -0,0 +1,23 @@ +Rust std::fmt::Display doesn't expect a C void*, change to print it in +hexadecimal + +--- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig 2019-10-22 12:20:33.250687971 +0700 ++++ third_party/rust/audio_thread_priority/src/rt_linux.rs 2019-10-22 12:39:10.400928328 +0700 +@@ -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 {:?}", pthread_id); + 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 {:?}", rt_priority_handle.pthread_id); + return Err(()); + } + return Ok(()); diff --git a/srcpkgs/firefox/patches/initialize_sched_param.patch b/srcpkgs/firefox/patches/initialize_sched_param.patch deleted file mode 100644 index ee593c3c21..0000000000 --- a/srcpkgs/firefox/patches/initialize_sched_param.patch +++ /dev/null @@ -1,22 +0,0 @@ -source: https://github.com/padenot/audio_thread_priority/commit/a1443a02667c649cb72873a45b98fffbd2eac5a8 - -commit a1443a02667c649cb72873a45b98fffbd2eac5a8 -Author: Paul Adenot -Date: Mon Aug 19 15:00:39 2019 +0200 - - initialize sched_param using std::mem::zeroed to fix compilation against other libc than glibc - -diff --git a/src/rt_linux.rs b/src/rt_linux.rs -index d8c0114..fbb4fde 100644 ---- third_party/rust/audio_thread_priority/src/rt_linux.rs.orig 2019-09-03 22:57:00.197152845 +0200 -+++ third_party/rust/audio_thread_priority/src/rt_linux.rs 2019-09-03 23:05:42.219159018 +0200 -@@ -93,8 +93,8 @@ pub fn promote_current_thread_to_real_time_internal(audio_buffer_frames: u32, - { - let thread_id = unsafe { libc::syscall(libc::SYS_gettid) }; - let pthread_id = unsafe { libc::pthread_self() }; -+ let mut param = unsafe { std::mem::zeroed::() }; - let mut policy = 0; -- let mut param = libc::sched_param { sched_priority: 0 }; - - if unsafe { libc::pthread_getschedparam(pthread_id, &mut policy, &mut param) } < 0 { - error!("pthread_getschedparam error {}", pthread_id); diff --git a/srcpkgs/firefox/patches/rust-configure.patch b/srcpkgs/firefox/patches/rust-configure.patch index 84077f4fc8..887c102bc5 100644 --- a/srcpkgs/firefox/patches/rust-configure.patch +++ b/srcpkgs/firefox/patches/rust-configure.patch @@ -1,9 +1,9 @@ Mozilla rustc check does not support crossbuild: let's remove it Remove calls to unwrap_rustup, they fail if rustup isn't present ---- build/moz.configure/rust.configure 2019-07-06 03:48:30.000000000 +0200 -+++ build/moz.configure/rust.configure 2019-07-09 22:35:23.326851798 +0200 -@@ -79,9 +79,6 @@ +--- build/moz.configure/rust.configure.orig 2019-10-17 04:19:59.000000000 +0700 ++++ build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700 +@@ -78,9 +78,6 @@ return unwrap @@ -13,7 +13,7 @@ Remove calls to unwrap_rustup, they fail if rustup isn't present set_config('CARGO', cargo) set_config('RUSTC', rustc) -@@ -294,26 +291,6 @@ +@@ -348,26 +345,6 @@ os.write(in_fd, source) os.close(in_fd) @@ -33,7 +33,7 @@ Remove calls to unwrap_rustup, they fail if rustup isn't present - a rust std library for that target installed. Try: - - rustup target add {} -- '''.format(host_or_target.alias, rustc, rustc_target.alias))) +- '''.format(host_or_target.alias, rustc, rustc_target))) - check_cmd_output(*cmd, onerror=failed) - if not os.path.exists(out_path) or os.path.getsize(out_path) == 0: - failed() diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 4797caaff0..fecce28d99 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -3,15 +3,15 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n". # pkgname=firefox -version=69.0.3 -revision=2 +version=70.0 +revision=1 build_helper="rust" short_desc="Mozilla Firefox web browser" maintainer="Johannes " 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=7527947a876c1734b8b2339f19b8ff8da6f4e4d06351b44940cb48d3509bb891 +checksum=cd9f2902753831c07c4b2ee64f7826f33ca1123add6440dc34abe3ff173a0cc6 lib32disabled=yes @@ -25,7 +25,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel $(vopt_if startup_notification startup-notification-devel) $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel)" -depends="nss>=3.37.3 desktop-file-utils hicolor-icon-theme" +depends="nss>=3.46.1 desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"