Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
firefox: move to extra and bump to 78.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dylanaraps committed Jun 30, 2020
1 parent 5288801 commit c76e939
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 565 deletions.
3 changes: 0 additions & 3 deletions extra/firefox/build
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ export MOZ_NOSPAM=1
--without-system-nss \
--with-system-jpeg \
--with-system-zlib \
--with-system-bz2 \
--with-system-png \
--without-system-libvpx \
--with-system-pixman \
--with-system-ffi \
--disable-gconf \
--disable-profiling \
--disable-accessibility \
--disable-tests \
Expand All @@ -76,7 +74,6 @@ export MOZ_NOSPAM=1
--disable-gold \
--disable-jemalloc \
--disable-pulseaudio \
--disable-startup-notification \
--disable-crashreporter \
--disable-updater \
--disable-dbus \
Expand Down
4 changes: 2 additions & 2 deletions extra/firefox/checksums
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
54256fc5f8e9c2e8129ef84773fae31fcfdaf95da6d4d03151f3939e9f749640 firefox-77.0.1.source.tar.xz
291a593151e476e6c4b61e48a3bdd5a11896fbde6261dcad347d5b7df265a058 firefox-78.0.source.tar.xz
f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e autoconf-2.13.tar.gz
3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f yasm-1.3.0.tar.gz
897f4a17750ef6dfb583b4bba3ace5e86698c6e7a2cf87ff461a13408d5d1952 no-dbus.patch
9b4c5c6bd57198abc4c846a1000603007f17e85577d861fd67ee11762a7c1c1b no-dbus.patch
60 changes: 30 additions & 30 deletions extra/firefox/patches/no-dbus.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/Cargo.lock b/Cargo.lock
index ae8c60bff4..88cfd6fdc1 100644
index b1fca7cbca..888dd6d3fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -99,25 +99,11 @@ dependencies = [
@@ -111,25 +111,11 @@ dependencies = [
"bitflags",
]

Expand All @@ -28,23 +28,23 @@ index ae8c60bff4..88cfd6fdc1 100644
"bincode",
"bytes 0.4.9",
"cc",
@@ -144,7 +130,6 @@ dependencies = [
@@ -156,7 +142,6 @@ dependencies = [
name = "audioipc-client"
version = "0.4.0"
dependencies = [
- "audio_thread_priority",
"audioipc",
"cubeb-backend",
"futures 0.1.23",
@@ -157,7 +142,6 @@ dependencies = [
"futures 0.1.29",
@@ -169,7 +154,6 @@ dependencies = [
name = "audioipc-server"
version = "0.2.3"
dependencies = [
- "audio_thread_priority",
"audioipc",
"cubeb-core",
"error-chain",
@@ -1784,7 +1768,6 @@ dependencies = [
@@ -1890,7 +1874,6 @@ dependencies = [
name = "gkrust-shared"
version = "0.1.0"
dependencies = [
Expand All @@ -53,10 +53,10 @@ index ae8c60bff4..88cfd6fdc1 100644
"audioipc-server",
"authenticator",
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
index d6350d4ed5..4cd666774b 100644
index 2fe91affcd..ae835b2c34 100644
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -115,9 +115,7 @@
@@ -111,9 +111,7 @@
#include "GMPServiceChild.h"
#include "nsIStringBundle.h"
#include "Geolocation.h"
Expand All @@ -66,7 +66,7 @@ index d6350d4ed5..4cd666774b 100644
#include "nsIURIMutator.h"
#include "nsIInputStreamChannel.h"
#include "nsFocusManager.h"
@@ -1666,9 +1664,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetProcessSandbox(
@@ -1624,9 +1622,7 @@ mozilla::ipc::IPCResult ContentChild::RecvSetProcessSandbox(
} else {
// Pre-start audio before sandboxing; see bug 1443612.
if (StaticPrefs::media_cubeb_sandbox()) {
Expand All @@ -77,11 +77,11 @@ index d6350d4ed5..4cd666774b 100644
} else {
Unused << CubebUtils::GetCubebContext();
diff --git a/dom/media/GraphRunner.cpp b/dom/media/GraphRunner.cpp
index e929967f98..5e463aa8fa 100644
index 6ea8f2e9ca..51dba21d71 100644
--- a/dom/media/GraphRunner.cpp
+++ b/dom/media/GraphRunner.cpp
@@ -13,7 +13,6 @@
#include "nsISupportsImpl.h"
#include "nsISupportsPriority.h"
#include "prthread.h"
#include "Tracing.h"
-#include "audio_thread_priority.h"
Expand All @@ -105,8 +105,8 @@ index e929967f98..5e463aa8fa 100644
- atp_demote_current_thread_from_real_time(handle);
- }

dom::WorkletThread::DeleteCycleCollectedJSContext();

return NS_OK;
}
diff --git a/dom/media/UnderrunHandlerLinux.cpp b/dom/media/UnderrunHandlerLinux.cpp
index af5c84538e..9fecb5ebd2 100644
--- a/dom/media/UnderrunHandlerLinux.cpp
Expand Down Expand Up @@ -142,10 +142,10 @@ index af5c84538e..9fecb5ebd2 100644

} // namespace mozilla
diff --git a/dom/media/moz.build b/dom/media/moz.build
index 5c9d0270bd..4ecdc697b6 100644
index c8dc9fe2d1..ae43f16fa3 100644
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -102,7 +102,6 @@ XPIDL_SOURCES += [
@@ -100,7 +100,6 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'dom_media'

EXPORTS += [
Expand All @@ -154,7 +154,7 @@ index 5c9d0270bd..4ecdc697b6 100644
'ADTSDemuxer.h',
'AsyncLogger.h',
diff --git a/media/audioipc/audioipc/Cargo.toml b/media/audioipc/audioipc/Cargo.toml
index 1a50c06cfd..eef2c70d0c 100644
index dfffa97f24..d9d2cf7d95 100644
--- a/media/audioipc/audioipc/Cargo.toml
+++ b/media/audioipc/audioipc/Cargo.toml
@@ -19,7 +19,6 @@ serde = "1"
Expand All @@ -166,7 +166,7 @@ index 1a50c06cfd..eef2c70d0c 100644
[target.'cfg(unix)'.dependencies]
iovec = "0.1"
diff --git a/media/audioipc/audioipc/src/messages.rs b/media/audioipc/audioipc/src/messages.rs
index 069cd592a8..f0fae5b4c1 100644
index 9cda962e0e..37e6119b74 100644
--- a/media/audioipc/audioipc/src/messages.rs
+++ b/media/audioipc/audioipc/src/messages.rs
@@ -5,8 +5,6 @@
Expand All @@ -178,7 +178,7 @@ index 069cd592a8..f0fae5b4c1 100644
use cubeb::{self, ffi};
use std::ffi::{CStr, CString};
use std::os::raw::{c_char, c_int, c_uint};
@@ -210,8 +208,6 @@ pub enum ServerMessage {
@@ -211,8 +209,6 @@ pub enum ServerMessage {
StreamGetCurrentDevice(usize),
StreamRegisterDeviceChangeCallback(usize, bool),

Expand All @@ -187,7 +187,7 @@ index 069cd592a8..f0fae5b4c1 100644
}

// Server -> Client messages.
@@ -241,8 +237,6 @@ pub enum ClientMessage {
@@ -243,8 +239,6 @@ pub enum ClientMessage {
StreamCurrentDevice(Device),
StreamRegisterDeviceChangeCallback,

Expand All @@ -197,7 +197,7 @@ index 069cd592a8..f0fae5b4c1 100644
Error(c_int),
}
diff --git a/media/audioipc/client/Cargo.toml b/media/audioipc/client/Cargo.toml
index 82c874e013..eaf9a62cc7 100644
index 4a55c0162e..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."
Expand All @@ -206,7 +206,7 @@ index 82c874e013..eaf9a62cc7 100644
[dependencies]
-audio_thread_priority = "0.22"
audioipc = { path="../audioipc" }
cubeb-backend = "0.6.0"
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
Expand Down Expand Up @@ -264,7 +264,7 @@ index 6b13900c54..87323508b8 100644
}

diff --git a/media/audioipc/server/Cargo.toml b/media/audioipc/server/Cargo.toml
index 3171873881..3363f143c7 100644
index 99afe54939..99a3440d33 100644
--- a/media/audioipc/server/Cargo.toml
+++ b/media/audioipc/server/Cargo.toml
@@ -9,7 +9,6 @@ description = "Remote cubeb server"
Expand All @@ -273,10 +273,10 @@ index 3171873881..3363f143c7 100644
[dependencies]
-audio_thread_priority = "0.22"
audioipc = { path = "../audioipc" }
cubeb-core = "0.6.0"
futures = "0.1.18"
cubeb-core = "0.7.0"
futures = "0.1.29"
diff --git a/media/audioipc/server/src/lib.rs b/media/audioipc/server/src/lib.rs
index 4ae9dc3ddc..ad1e1297d5 100644
index 4d49c8fc08..3c44ee3def 100644
--- a/media/audioipc/server/src/lib.rs
+++ b/media/audioipc/server/src/lib.rs
@@ -9,7 +9,6 @@ extern crate error_chain;
Expand All @@ -301,7 +301,7 @@ index 4ae9dc3ddc..ad1e1297d5 100644
Ok(())
},
diff --git a/media/audioipc/server/src/server.rs b/media/audioipc/server/src/server.rs
index 33b8ecdc9f..e08ffe239a 100644
index f07432f71f..b90e9d9be7 100644
--- a/media/audioipc/server/src/server.rs
+++ b/media/audioipc/server/src/server.rs
@@ -3,8 +3,6 @@
Expand All @@ -313,7 +313,7 @@ index 33b8ecdc9f..e08ffe239a 100644
use audioipc;
use audioipc::codec::LengthDelimitedCodec;
use audioipc::frame::{framed, Framed};
@@ -612,19 +610,6 @@ impl CubebServer {
@@ -636,19 +634,6 @@ impl CubebServer {
)
.unwrap_or_else(error),

Expand All @@ -334,7 +334,7 @@ index 33b8ecdc9f..e08ffe239a 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 59bb94f621..71c7fa66bf 100644
index 5fdb0eb2c0..d9bc0346cb 100644
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -41,7 +41,6 @@ storage = { path = "../../../../storage/rust" }
Expand All @@ -346,7 +346,7 @@ index 59bb94f621..71c7fa66bf 100644
neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
diff --git a/toolkit/library/rust/shared/lib.rs b/toolkit/library/rust/shared/lib.rs
index 069fbdafb3..2919fdce1c 100644
index 3285383a11..d228bc9bad 100644
--- a/toolkit/library/rust/shared/lib.rs
+++ b/toolkit/library/rust/shared/lib.rs
@@ -51,7 +51,6 @@ extern crate xpcom;
Expand All @@ -355,5 +355,5 @@ index 069fbdafb3..2919fdce1c 100644

-extern crate audio_thread_priority;

#[cfg(feature = "new_webext_storage")]
#[cfg(not(target_os = "android"))]
extern crate webext_storage_bridge;
2 changes: 1 addition & 1 deletion extra/firefox/sources
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
https://ftp.mozilla.org/pub/firefox/releases/77.0.1/source/firefox-77.0.1.source.tar.xz
https://ftp.mozilla.org/pub/firefox/releases/78.0/source/firefox-78.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
2 changes: 1 addition & 1 deletion extra/firefox/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
77.0.1 1
78.0 1
95 changes: 0 additions & 95 deletions testing/firefox/build

This file was deleted.

4 changes: 0 additions & 4 deletions testing/firefox/checksums

This file was deleted.

Loading

0 comments on commit c76e939

Please sign in to comment.