diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2021-02-18 20:47:35 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2021-02-19 08:59:50 +0100 |
| commit | ee1a7d961cd6886f9beadcf29069ecdf36113168 (patch) | |
| tree | b0c35a85650c6710c32131849ba2f130628aea69 /source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch | |
| parent | 8b03d869e114578be209fde7fe72498970f6998e (diff) | |
| download | current-d270413c9f2f29364ef272a810d8a9c32a35323e.tar.gz current-d270413c9f2f29364ef272a810d8a9c32a35323e.tar.xz | |
Thu Feb 18 20:47:35 UTC 202120210218204735
xap/mozilla-firefox-78.7.1esr-x86_64-1.txz: Upgraded.
It looks like rebuilding Firefox with Rust 1.50.0 causes it to crash on
HTML5 streams, so let's drop back to this build. 78.8.0 is coming soon
and hopefully it'll fix this.
Diffstat (limited to 'source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch')
| -rw-r--r-- | source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch b/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch new file mode 100644 index 000000000..73dec34cc --- /dev/null +++ b/source/xap/mozilla-thunderbird/0041-bmo-1684261-Fix-build-with-rust-1.50.0.patch @@ -0,0 +1,58 @@ +From eb88f36f108a201d531f82789a86a4281f37b3b0 Mon Sep 17 00:00:00 2001 +From: Thomas Deutschmann <whissi@gentoo.org> +Date: Sun, 14 Feb 2021 14:57:47 +0100 +Subject: [PATCH 41/41] bmo#1684261: Fix build with rust 1.50.0 + +Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> +--- + .cargo/config.in | 2 +- + Cargo.lock | 2 +- + Cargo.toml | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/.cargo/config.in b/.cargo/config.in +index 0ee86efe40..1accd1ef72 100644 +--- a/.cargo/config.in ++++ b/.cargo/config.in +@@ -3,9 +3,9 @@ + # Please do not edit. + + [source."https://github.com/shravanrn/nix/"] +-branch = "r0.13.1" + git = "https://github.com/shravanrn/nix/" + replace-with = "vendored-sources" ++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e" + + [source."https://github.com/mozilla/rkv"] + git = "https://github.com/mozilla/rkv" +diff --git a/Cargo.lock b/Cargo.lock +index d6dffc0133..e7b0247088 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -3200,7 +3200,7 @@ dependencies = [ + [[package]] + name = "nix" + version = "0.13.1" +-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e" ++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e" + dependencies = [ + "bitflags", + "cc", +diff --git a/Cargo.toml b/Cargo.toml +index 2c162e6567..3173ef840c 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -68,8 +68,8 @@ panic = "abort" + libudev-sys = { path = "dom/webauthn/libudev-sys" } + packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" } + rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" } +-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } +-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" } ++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" } ++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" } + # failure's backtrace feature might break our builds, see bug 1608157. + failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } + failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" } +-- +2.30.1 + |