From 436df47576d8326b198e3cda184a4f0a1a053f4c Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Thu, 4 Nov 2021 10:19:06 +0100
Subject: [PATCH] v94.0-1

---
 deb_patches/relax-cargo-dep.patch     | 12 +++++++++++
 scripts/1_Install_Dependencies.sh     |  3 ---
 scripts/3_Configure_Source_Code.sh    | 29 +++++++++++++++++++++++++++
 scripts/5_Configure_Binary_Tarball.sh |  2 +-
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 deb_patches/relax-cargo-dep.patch

diff --git a/deb_patches/relax-cargo-dep.patch b/deb_patches/relax-cargo-dep.patch
new file mode 100644
index 0000000..46c3eff
--- /dev/null
+++ b/deb_patches/relax-cargo-dep.patch
@@ -0,0 +1,12 @@
+diff -r 246cfe5d5a05 build/moz.configure/rust.configure
+--- a/build/moz.configure/rust.configure	Sat Oct 02 16:40:36 2021 +0000
++++ b/build/moz.configure/rust.configure	Sun Oct 03 11:00:29 2021 +0200
+@@ -171,7 +171,7 @@
+             )
+         )
+     rustc_min_version = Version(MINIMUM_RUST_VERSION)
+-    cargo_min_version = rustc_min_version
++    cargo_min_version = Version("1.51.0")
+ 
+     version = rustc_info.version
+     is_nightly = "nightly" in version.version
diff --git a/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh
index 52ec91c..6851492 100755
--- a/scripts/1_Install_Dependencies.sh
+++ b/scripts/1_Install_Dependencies.sh
@@ -42,9 +42,6 @@ _DEPENDENCIES="wget git xvfb \
         rustc \
         nasm-mozilla"
 
-        # cargo \
-        # rustc \
-
 export DEBIAN_FRONTEND=noninteractive
 
 # Installs Dependencies
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index ffb50fd..019e844 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -126,6 +126,7 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-armhf-webrtc-build.patch"
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch"
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/reduce-rust-debuginfo.patch"
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
+patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/relax-cargo-dep.patch"
 
 # Remove some pre-installed addons that might be questionable
 patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
@@ -174,4 +175,32 @@ patch -Np1 -i ${_PATCHES_DIR}/about-dialog.patch
 # created directories
 patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch
 
+# allow uBlockOrigin to run in private mode by default, without user intervention.
+patch -Np1 -i ${_PATCHES_DIR}/allow-ubo-private-mode.patch
+
+# ui patches
+
+# show a warning saying that changing language is not allowed through the UI,
+# and that it requires to visit our FAQ, instead of telling the user to check his connection.
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/add-language-warning.patch
+
+# remove references to firefox from the settings UI, change text in some of the links,
+# explain that we force en-US and suggest enabling history near the session restore checkbox.
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/pref-naming.patch
+
+# remove firefox references in the urlbar, when suggesting opened tabs.
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-branding-urlbar.patch
+
+# remove cfr UI elements, as they are disabled and locked already.
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-cfrprefs.patch
+
+# do not display your browser is being managed by your organization in the settings.
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-organization-policy-banner.patch
+
+# hide "snippets" section from the home page settings, as it was already locked.
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-snippets-from-home.patch
+
+# add warning that sanitizing exceptions are bypassed by the options in History > Clear History when LibreWolf closes > Settings
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/sanitizing-description.patch
+
 rm -rf common
diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh
index f58745a..d1bdd09 100755
--- a/scripts/5_Configure_Binary_Tarball.sh
+++ b/scripts/5_Configure_Binary_Tarball.sh
@@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
 CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
 _SCRIPT_FOLDER=$(realpath $(dirname $0));
 _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
-_SETTINGS_TAG=${SETTINGS_TAG:-'2.0'}
+_SETTINGS_TAG=${SETTINGS_TAG:-'3.0'}
 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball