0001-allow-JXL-in-non-nightly-browser.patch

@@ -0,0 +1,30 @@
+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
+

deb_patches/armhf-reduce-linker-memory-use.patch

@@ -5,31 +5,20 @@ Author: Olivier Tilloy <olivier.tilloy@canonical.com>
 
 --- a/build/moz.configure/toolchain.configure
 +++ b/build/moz.configure/toolchain.configure
-@@ -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"):
+@@ -1631,12 +1631,15 @@ set_config("LINKER_KIND", select_linker.KIND)
+     target_multiarch_dir,
+     android_platform,
+     c_compiler,
++    host,
+ )
+ @imports("os")
+ def linker_ldflags(
+-    linker, target, sysroot, multiarch_dir, android_platform, c_compiler
++    linker, target, sysroot, multiarch_dir, android_platform, c_compiler, 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"):

scripts/3_Configure_Source_Code.sh

@@ -147,17 +147,20 @@ 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"
 
-# allow enabling JPEG XL in non-nightly browser
-patch -Np1 -i ${_PATCHES_DIR}/allow-JXL-in-non-nightly-browser.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
 
+# Debian patch to enable global menubar
+# if [[ ! -z "${GLOBAL_MENUBAR}" ]];then
+  # patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
+# fi
 
-# 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
+# experimentally re-included
+patch -Np1 -i ${_PATCHES_DIR}/unity-menubar.patch
+patch -Np1 -i ${_PATCHES_DIR}/mozilla-kde_after_unity.patch
 
 # Disabling Pocket
 printf "\nDisabling Pocket\n";
@@ -168,14 +171,12 @@ patch -Np1 -i "${_PATCHES_DIR}/context-menu.patch"
 
 patch -Np1 -i "${_PATCHES_DIR}/urlbarprovider-interventions.patch"
 
-patch -Np1 -i "${_PATCHES_DIR}/unified-extensions-dont-show-recommendations.patch"
+# Remove Internal Plugin Certificates
+patch -Np1 -i "${_PATCHES_DIR}/sed-patches/remove-internal-plugin-certs.patch"
 
 # allow SearchEngines option in non-ESR builds
 patch -Np1 -i "${_PATCHES_DIR}/sed-patches/allow-searchengines-non-esr.patch"
 
-# fix broken(?)/unintended handling of autoconf file loading in flatpak/snap environments
-patch -Np1 -i "${_PATCHES_DIR}/flatpak_autoconf.patch"
-
 # remove search extensions (experimental)
 # patch -Np1 -i "${_PATCHES_DIR}/search-config.patch"
 cp "${_SOURCE_REPO_DIR}/assets/search-config.json" services/settings/dumps/main/search-config.json
@@ -209,6 +210,9 @@ patch -Np1 -i ${_PATCHES_DIR}/ui-patches/pref-naming.patch
 #
 patch -Np1 -i ${_PATCHES_DIR}/ui-patches/handlers.patch
 
+#
+patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remap-links.patch
+
 #
 patch -Np1 -i ${_PATCHES_DIR}/ui-patches/hide-default-browser.patch
 

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:-'7.4'}
+_SETTINGS_TAG=${SETTINGS_TAG:-'486637e9dfd1352e427e73eef354d22bfbd026f5'}
 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball