From 69e0b71cdfb9129dc0429c4e9d5531e66e3e0927 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Mon, 24 Oct 2022 13:03:11 +0200
Subject: [PATCH] update patches and add aarch64 fix for 106.0.1

---
 scripts/3_Configure_Source_Code.sh    | 9 +++++++++
 scripts/5_Configure_Binary_Tarball.sh | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index 7d0434b..4baa63f 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -116,6 +116,9 @@ END
 
   export LDFLAGS+=" -Wl,--no-keep-memory -Wl"
 
+  # libav related aarch64 build failure
+  wget https://github.com/mozilla/gecko-dev/commit/60858bce4bb1b426c07ec0e9e7f627f59b8aca45.patch -O "${_PATCHES_DIR}/aarch64_libav.patch"
+  patch -Np1 -i "${_PATCHES_DIR}/aarch64_libav.patch"
 else
     cat >>${CI_PROJECT_DIR}/mozconfig <<END
 # ubuntu seems to recommend this
@@ -234,6 +237,12 @@ patch -Np1 -i ${_PATCHES_DIR}/ui-patches/website-appearance-ui-rfp.patch
 # pref pane
 patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch
 
+# firefox view
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/firefox-view.patch
+
+# new prefs (view, ubo)
+patch -Np1 -i ${_PATCHES_DIR}/librewolf-prefs.patch
+
 # fix telemetry removal, see https://gitlab.com/librewolf-community/browser/linux/-/merge_requests/17, for example
 patch -Np1 -i ${_PATCHES_DIR}/disable-data-reporting-at-compile-time.patch
 
diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh
index 32e6f2d..e09cc8a 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:-'6.7'}
+_SETTINGS_TAG=${SETTINGS_TAG:-'7.2-hotfix'}
 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball