From 155367a779f8834219332cdee9300c3fba02cbcb Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Sat, 3 Dec 2022 22:21:55 +0100
Subject: [PATCH] v107.0.1-1 CI

---
 0001-allow-JXL-in-non-nightly-browser.patch | 30 ---------------------
 scripts/3_Configure_Source_Code.sh          |  3 ---
 scripts/5_Configure_Binary_Tarball.sh       |  2 +-
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 0001-allow-JXL-in-non-nightly-browser.patch

diff --git a/0001-allow-JXL-in-non-nightly-browser.patch b/0001-allow-JXL-in-non-nightly-browser.patch
deleted file mode 100644
index df6de42..0000000
--- a/0001-allow-JXL-in-non-nightly-browser.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 55d449fbb8855ce34c047a4b031f0bd1d9f782e8 Mon Sep 17 00:00:00 2001
-From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
-Date: Wed, 16 Nov 2022 09:53:57 +0100
-Subject: [PATCH] allow JXL in non nightly browser
-
----
- toolkit/moz.configure | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index c99b4d628c54..0b1b1614620a 100644
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -703,9 +703,10 @@ set_define("MOZ_AV1", av1)
- option("--disable-jxl", help="Disable jxl image support")
- 
- 
--@depends("--disable-jxl", milestone.is_nightly)
--def jxl(value, is_nightly):
--    if is_nightly and value:
-+@depends("--disable-jxl")
-+def jxl(value):
-+    enabled = bool(value)
-+    if enabled:
-         return True
- 
- 
--- 
-2.38.1
-
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index 1f2fb91..799f5df 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -147,9 +147,6 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch"
 # might make the build just a tiny bit cleaner, not really required though
 patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/fix-wayland-build.patch"
 
-# experimental: allow enabling JPEG XL in non-nightly browser
-patch -Np1 -i ${CI_PROJECT_DIR}/0001-allow-JXL-in-non-nightly-browser.patch
-
 # Remove some pre-installed addons that might be questionable
 patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
 
diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh
index 2161c4e..868f381 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:-'486637e9dfd1352e427e73eef354d22bfbd026f5'}
+_SETTINGS_TAG=${SETTINGS_TAG:-'3.7'}
 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball