firefox: 80.0

2020-08-26 16:32:58 +03:00 · 2020-08-26 16:32:58 +03:00 · 37fb15174b
commit 37fb15174b
parent 8ed0cf9f02
6 changed files with 38 additions and 60 deletions
--- a/extra/firefox/build
+++ b/extra/firefox/build
@ -1,7 +1,6 @@
 #!/bin/sh -e

 patch -p1 < no-dbus.patch
-patch -p1 < rust-1.45.patch

 # Remove libc header which conflicts with 7 or so Linux
 # kernel headers. See: https://github.com/kisslinux/repo/issues/207
--- a/extra/firefox/checksums
+++ b/extra/firefox/checksums
@ -1,5 +1,4 @@
-12a922855914ec6b4d4f06a4ac58bc549aca6bdafd3722d68a3d709a935e5713  firefox-79.0.source.tar.xz
-f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e  autoconf-2.13.tar.gz
-3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f  yasm-1.3.0.tar.gz
-002ea9051c7f6d185c283be2f6606c8589c00925661b22f105e4100656c852e9  no-dbus.patch
-675a71dd0659a26db2f8b6665c57da3c481d8b9fb164b227fa8eed465483a42b  rust-1.45.patch
+380d9853e0712442ba2d4acd85c0e09c19ad36561a3ea8932705ad6b8a91146a
+f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e
+3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
+458bcc3e2e86d380f06cb8c569e7a333ca4ad513434a9a2d96a1810fc587941e
--- a/extra/firefox/patches/no-dbus.patch
+++ b/extra/firefox/patches/no-dbus.patch
@ -1,5 +1,5 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index 0b61796d7d..73b9fc36fa 100644
+index 326a465696..2d40df9787 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
@@ -109,25 +109,11 @@ dependencies = [
@ -8,9 +8,9 @@ index 0b61796d7d..73b9fc36fa 100644
 
 -[[package]]
 -name = "audio_thread_priority"
-version = "0.22.1"
+-version = "0.23.4"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fba1500e466a39dd3faa5aed20a50dfe0aa1b905264a453bbe9f49508994cc"
+-checksum = "cec7141c59547709f640219f15512026d416c0ca8ce7a5ac1524923ee65be2cb"
 -dependencies = [
 - "cfg-if",
 - "dbus",
@ -44,7 +44,7 @@ index 0b61796d7d..73b9fc36fa 100644
  "audioipc",
  "cubeb-core",
  "error-chain",
-@@ -1867,7 +1851,6 @@ name = "gkrust-shared"
+@@ -1893,7 +1877,6 @@ name = "gkrust-shared"
 version = "0.1.0"
 dependencies = [
  "app_services_logger",
@ -53,10 +53,10 @@ index 0b61796d7d..73b9fc36fa 100644
  "audioipc-server",
  "authenticator",
 diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
-index 6db75a0584..3cba9ed32d 100644
+index b2edfd37ca..f88dfd031f 100644
 --- a/dom/ipc/ContentChild.cpp
 +++ b/dom/ipc/ContentChild.cpp
-@@ -115,9 +115,7 @@
+@@ -116,9 +116,7 @@
 #include "GMPServiceChild.h"
 #include "nsIStringBundle.h"
 #include "Geolocation.h"
@ -66,7 +66,7 @@ index 6db75a0584..3cba9ed32d 100644
 #include "nsIURIMutator.h"
 #include "nsIInputStreamChannel.h"
 #include "nsFocusManager.h"
-@@ -1622,9 +1620,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetProcessSandbox(
+@@ -1628,9 +1626,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetProcessSandbox(
 
   if (StaticPrefs::media_cubeb_sandbox()) {
     // This needs to happen regardless of whether sandboxing is enabled.
@ -142,10 +142,10 @@ index 05646fbeb8..1de4f6f43a 100644
 
 }  // namespace mozilla
 diff --git a/dom/media/moz.build b/dom/media/moz.build
-index ac847c3a02..6097dffc40 100644
+index 9a827378e5..204067f65a 100644
 --- a/dom/media/moz.build
 +++ b/dom/media/moz.build
-@@ -100,7 +100,6 @@ XPIDL_SOURCES += [
+@@ -98,7 +98,6 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'dom_media'
 
 EXPORTS += [
@ -154,14 +154,14 @@ index ac847c3a02..6097dffc40 100644
     'ADTSDemuxer.h',
     'AsyncLogger.h',
 diff --git a/media/audioipc/audioipc/Cargo.toml b/media/audioipc/audioipc/Cargo.toml
-index dfffa97f24..d9d2cf7d95 100644
+index 69e38bbe77..d9d2cf7d95 100644
 --- a/media/audioipc/audioipc/Cargo.toml
 +++ b/media/audioipc/audioipc/Cargo.toml
@@ -19,7 +19,6 @@ serde = "1"
 serde_derive = "1"
 tokio = "0.1"
 tokio-io = "0.1"
-audio_thread_priority = "0.22"
+-audio_thread_priority = "0.23.4"
 
 [target.'cfg(unix)'.dependencies]
 iovec = "0.1"
@ -197,19 +197,19 @@ index 9cda962e0e..37e6119b74 100644
     Error(c_int),
 }
 diff --git a/media/audioipc/client/Cargo.toml b/media/audioipc/client/Cargo.toml
-index 4a55c0162e..2fbccc05df 100644
+index 2119145607..2fbccc05df 100644
 --- a/media/audioipc/client/Cargo.toml
 +++ b/media/audioipc/client/Cargo.toml
@@ -9,7 +9,6 @@ description = "Cubeb Backend for talking to remote cubeb server."
 edition = "2018"
 
 [dependencies]
-audio_thread_priority = "0.22"
+-audio_thread_priority = "0.23.4"
 audioipc = { path="../audioipc" }
 cubeb-backend = "0.7"
 futures = { version="0.1.18", default-features=false, features=["use_std"] }
 diff --git a/media/audioipc/client/src/context.rs b/media/audioipc/client/src/context.rs
-index 6b13900c54..87323508b8 100644
+index 7441d0c0e0..57ad55316d 100644
 --- a/media/audioipc/client/src/context.rs
 +++ b/media/audioipc/client/src/context.rs
@@ -6,10 +6,6 @@
@ -223,7 +223,7 @@ index 6b13900c54..87323508b8 100644
 use audioipc::codec::LengthDelimitedCodec;
 use audioipc::frame::{framed, Framed};
 use audioipc::platformhandle_passing::{framed_with_platformhandles, FramedWithPlatformHandles};
-@@ -72,31 +68,6 @@ impl ClientContext {
+@@ -77,31 +73,6 @@ impl ClientContext {
     }
 }
 
@ -255,7 +255,7 @@ index 6b13900c54..87323508b8 100644
 
 fn register_thread(callback: Option<extern "C" fn(*const ::std::os::raw::c_char)>) {
     if let Some(func) = callback {
-@@ -116,7 +87,6 @@ fn promote_and_register_thread(
+@@ -121,7 +92,6 @@ fn promote_and_register_thread(
     rpc: &rpc::ClientProxy<ServerMessage, ClientMessage>,
     callback: Option<extern "C" fn(*const ::std::os::raw::c_char)>,
 ) {
@ -264,14 +264,14 @@ index 6b13900c54..87323508b8 100644
 }
 
 diff --git a/media/audioipc/server/Cargo.toml b/media/audioipc/server/Cargo.toml
-index 99afe54939..99a3440d33 100644
+index 155e69621e..99a3440d33 100644
 --- a/media/audioipc/server/Cargo.toml
 +++ b/media/audioipc/server/Cargo.toml
@@ -9,7 +9,6 @@ description = "Remote cubeb server"
 edition = "2018"
 
 [dependencies]
-audio_thread_priority = "0.22"
+-audio_thread_priority = "0.23.4"
 audioipc = { path = "../audioipc" }
 cubeb-core = "0.7.0"
 futures = "0.1.29"
@ -334,27 +334,35 @@ index f07432f71f..b90e9d9be7 100644
 
         trace!("process_msg: req={:?}, resp={:?}", msg, resp);
 diff --git a/toolkit/library/rust/shared/Cargo.toml b/toolkit/library/rust/shared/Cargo.toml
-index 782a383b21..03557b3534 100644
+index 0426ff4076..e678ab05bc 100644
 --- a/toolkit/library/rust/shared/Cargo.toml
 +++ b/toolkit/library/rust/shared/Cargo.toml
@@ -41,7 +41,6 @@ storage = { path = "../../../../storage/rust" }
 bookmark_sync = { path = "../../../components/places/bookmark_sync", optional = true }
 shift_or_euc_c = "0.1.0"
 chardetng_c = "0.1.1"
-audio_thread_priority = "0.22.1"
+-audio_thread_priority = "0.23.4"
 mdns_service = { path="../../../../media/mtransport/mdns_service", optional = true }
 neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
 rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
+@@ -103,7 +102,7 @@ remote_agent = ["remote"]
+ glean = ["fog"]
+ glean_with_gecko = ["fog/with_gecko"]
+ rust_fxa_client = ["firefox-accounts-bridge"]
+-with_dbus = ["audio_thread_priority/with_dbus"]
+with_dbus = []
+ 
+ [lib]
+ path = "lib.rs"
 diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
-index eaaa6a6186..f9273e5e05 100644
+index eaaa6a6186..e576badc7d 100644
 --- a/toolkit/library/rust/shared/lib.rs
 +++ b/toolkit/library/rust/shared/lib.rs
-@@ -52,8 +52,6 @@ extern crate xpcom;
+@@ -52,7 +52,6 @@ extern crate xpcom;
 #[cfg(feature = "new_xulstore")]
 extern crate xulstore;
 
 -extern crate audio_thread_priority;
-
+ 
 #[cfg(not(target_os = "android"))]
 extern crate webext_storage_bridge;
- 
--- a/extra/firefox/patches/rust-1.45.patch
+++ b/extra/firefox/patches/rust-1.45.patch
@ -1,27 +0,0 @@
-From cb5b4585486a52d06315a800f9e4ed96f2677898 Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh+mozilla@glandium.org>
-Date: Mon, 20 Jul 2020 16:05:36 +0000
-Subject: [PATCH] Bug 1640982 - Set CARGO_PROFILE_RELEASE_LTO=true when
- enabling rust LTO. r=firefox-build-system-reviewers,rstewart
-
-Differential Revision: https://phabricator.services.mozilla.com/D84098
---
- config/makefiles/rust.mk | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk
-index 82182ffdf30fe..4b4a679593377 100644
--- a/config/makefiles/rust.mk
-+++ b/config/makefiles/rust.mk
-@@ -61,7 +61,11 @@ ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds, but not when linking
- # gkrust_gtest.
- ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
-+# Pass -Clto for older versions of rust, and CARGO_PROFILE_RELEASE_LTO=true
-+# for newer ones that support it. Combining the latter with -Clto works, so
-+# set both everywhere.
- cargo_rustc_flags += -Clto
-+export CARGO_PROFILE_RELEASE_LTO=true
- endif
- endif
- endif
--- a/extra/firefox/sources
+++ b/extra/firefox/sources
@ -1,5 +1,4 @@
-https://ftp.mozilla.org/pub/firefox/releases/79.0/source/firefox-79.0.source.tar.xz
+https://ftp.mozilla.org/pub/firefox/releases/80.0/source/firefox-80.0.source.tar.xz
 https://ftp.gnu.org/gnu/autoconf/autoconf-2.13.tar.gz autoconf2.13/
 https://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz yasm/
 patches/no-dbus.patch
-patches/rust-1.45.patch
--- a/extra/firefox/version
+++ b/extra/firefox/version
@ -1 +1 @@
-79.0 1
+80.0 1
 @ -1 +1 @@
 .0 1
 .0 1