diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh index d27d8ba..4ed6eee 100755 --- a/scripts/3_Configure_Source_Code.sh +++ b/scripts/3_Configure_Source_Code.sh @@ -132,12 +132,8 @@ patch -Np1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch" # Remove some pre-installed addons that might be questionable patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch -# Disable (some) megabar functionality -# Adapted from https://github.com/WesleyBranton/userChrome.css-Customizations -patch -Np1 -i ${_PATCHES_DIR}/removed-patches/megabar.patch - # remove mozilla vpn ads -patch -Np1 -i ${_PATCHES_DIR}/mozilla-vpn-ad.patch +patch -Np1 -i ${_PATCHES_DIR}/mozilla-vpn-ad2.patch # Debian patch to enable global menubar # if [[ ! -z "${GLOBAL_MENUBAR}" ]];then @@ -195,7 +191,7 @@ patch -Np1 -i ${_PATCHES_DIR}/custom-ubo-assets-bootstrap-location.patch patch -Np1 -i ${_PATCHES_DIR}/ui-patches/pref-naming.patch # -patch -Np1 -i ${_PATCHES_DIR}/ui-patches/hide-safe-browsing.patch +patch -Np1 -i ${_PATCHES_DIR}/ui-patches/privacy-preferences.patch # remove firefox references in the urlbar, when suggesting opened tabs. patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-branding-urlbar.patch diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh index 7dd5942..4834b84 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:-'5.5'} +_SETTINGS_TAG=${SETTINGS_TAG:-'6.0'} _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball