From 365d39cc018fe7b09f64fe8d346acab8e8a12b21 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Tue, 17 Jan 2023 17:04:00 +0100
Subject: [PATCH] v109.0-1

---
 .../armhf-reduce-linker-memory-use.patch      | 48 +++++++++++--------
 scripts/3_Configure_Source_Code.sh            | 11 ++---
 scripts/5_Configure_Binary_Tarball.sh         |  2 +-
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/deb_patches/armhf-reduce-linker-memory-use.patch b/deb_patches/armhf-reduce-linker-memory-use.patch
index 764b318..e87cf9b 100644
--- a/deb_patches/armhf-reduce-linker-memory-use.patch
+++ b/deb_patches/armhf-reduce-linker-memory-use.patch
@@ -5,23 +5,31 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -1674,6 +1674,7 @@
-     android_platform,
-     c_compiler,
-     developer_options,
-+    host,
- )
- @imports("os")
- def linker_ldflags(
-@@ -1684,8 +1685,11 @@
-     android_platform,
-     c_compiler,
-     developer_options,
-+    host,
- ):
-     flags = list((linker and linker.LINKER_FLAG) or [])
-+    if host.cpu == "arm":
-+        flags.append("-Wl,--no-keep-memory")
-     # rpath-link is irrelevant to wasm, see for more info https://github.com/emscripten-core/emscripten/issues/11076.
-     if sysroot.path and multiarch_dir and target.os != "WASI":
-         for d in ("lib", "usr/lib"):
+@@ -1699,6 +1699,7 @@
+             android_platform,
+             c_compiler,
+             developer_options,
++            host,
+         )
+     else:
+         deps = depends_if(
+@@ -1709,6 +1710,7 @@
+             dependable(None),
+             host_c_compiler,
+             developer_options,
++            host,
+         )
+ 
+     @deps
+@@ -1721,8 +1723,11 @@
+         android_platform,
+         c_compiler,
+         developer_options,
++        host,
+     ):
+         flags = list((linker and linker.LINKER_FLAG) or [])
++        if host.cpu == "arm":
++            flags.append("-Wl,--no-keep-memory")
+         # rpath-link is irrelevant to wasm, see for more info https://github.com/emscripten-core/emscripten/issues/11076.
+         if sysroot.path and multiarch_dir and target.os != "WASI":
+             for d in ("lib", "usr/lib"):
diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh
index 025da67..248a1c2 100755
--- a/scripts/3_Configure_Source_Code.sh
+++ b/scripts/3_Configure_Source_Code.sh
@@ -153,14 +153,11 @@ patch -Np1 -i ${_PATCHES_DIR}/allow-JXL-in-non-nightly-browser.patch
 # Remove some pre-installed addons that might be questionable
 patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch
 
-# Debian patch to enable global menubar
-# if [[ ! -z "${GLOBAL_MENUBAR}" ]];then
-  # patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
-# fi
 
-# experimentally re-included
-patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
-patch -Np1 -i ${_PATCHES_DIR}/mozilla-kde_after_unity.patch
+# KDE menu and unity menubar. patch order matters.
+patch -Np1 -i ${_PATCHES_DIR}/unity_kde/mozilla-kde.patch
+patch -Np1 -i ${_PATCHES_DIR}/unity_kde/firefox-kde.patch
+patch -Np1 -i ${_PATCHES_DIR}/unity_kde/unity-menubar.patch
 
 # Disabling Pocket
 printf "\nDisabling Pocket\n";
diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh
index 868f381..9b74439 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:-'3.7'}
+_SETTINGS_TAG=${SETTINGS_TAG:-'7.4'}
 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball