From fae361029078e318b2b295f6b5e827a48eb11ad9 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Tue, 23 Feb 2021 23:42:24 +0100
Subject: [PATCH] prepare v86.0: remove obsolete fixes

---
 rust_build_fix.patch               | 43 ------------------------------
 scripts/3_Configure_Source_Code.sh |  3 ---
 2 files changed, 46 deletions(-)
 delete mode 100644 rust_build_fix.patch

diff --git a/rust_build_fix.patch b/rust_build_fix.patch
deleted file mode 100644
index 9c66654..0000000
--- a/rust_build_fix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/.cargo/config.in b/.cargo/config.in
-index 2898d98..34c05c8 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/neqo"]
- git = "https://github.com/mozilla/neqo"
-diff --git a/Cargo.lock b/Cargo.lock
-index f2195b2..bd186c5 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -3409,7 +3409,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 eedde9d..bfc4813 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -76,8 +76,8 @@ chardetng = { git = "https://github.com/hsivonen/chardetng", rev="7d5e0608d3e012
- 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="f3cace4fb8b53db0849c62af4fa62bade5a620f7" }
--nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
--spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu4", rev = "e9eff10f964957e7a001c5f712effe17ce09aa99" }
-+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" }
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index 916c8ca..27611eb 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -126,9 +126,6 @@ patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-pep487.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/silence-gtk-style-assertions.patch"
 patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/sandbox-update-arm-syscall-numbers.patch"
 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1684261
-patch -Np1 -i "${CI_PROJECT_DIR}/rust_build_fix.patch"
-
 # Remove some pre-installed addons that might be questionable
 patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch