diff --git a/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh index 8fea58e..6d8ecaa 100755 --- a/scripts/1_Install_Dependencies.sh +++ b/scripts/1_Install_Dependencies.sh @@ -8,7 +8,7 @@ _DEPENDENCIES="wget git xvfb \ xz-utils \ gettext-base \ curl python3 libjack-dev \ - python3-psutil python-psutil python3-dev python-dev \ + python3-dev python-dev \ gnupg \ autotools-dev \ autoconf2.13 \ diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh index 143a3ed..9eb3c2a 100755 --- a/scripts/3_Configure_Source_Code.sh +++ b/scripts/3_Configure_Source_Code.sh @@ -114,9 +114,6 @@ END export RUSTFLAGS="-Cdebuginfo=0" export LDFLAGS+=" -Wl,--no-keep-memory -Wl" - # patch -Np1 -i ${_PATCHES_DIR}/arm.patch # not required anymore? - # wget https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/firefox/build-arm-libopus.patch -O ${_PATCHES_DIR}/build-arm-libopus.patch - # patch -Np1 -i ${_PATCHES_DIR}/build-arm-libopus.patch else cat >>${CI_PROJECT_DIR}/mozconfig < Clear History when LibreWolf closes > Settings patch -Np1 -i ${_PATCHES_DIR}/ui-patches/sanitizing-description.patch +# add patch to hide website appearance settings +patch -Np1 -i ${_PATCHES_DIR}/ui-patches/website-appearance-ui-rfp.patch + # pref pane patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch diff --git a/scripts/4_Build_Binary_Tarball.sh b/scripts/4_Build_Binary_Tarball.sh index a3567b7..afaadd0 100755 --- a/scripts/4_Build_Binary_Tarball.sh +++ b/scripts/4_Build_Binary_Tarball.sh @@ -42,7 +42,7 @@ fi export MOZ_NOSPAM=1 export MOZBUILD_STATE_PATH="${_MOZBUILD}" -export MACH_USE_SYSTEM_PYTHON=1 +export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system if [[ $CARCH == 'aarch64' ]]; then export MOZ_DEBUG_FLAGS=" " @@ -70,7 +70,7 @@ cd $srcdir; rm -f mozconfig # install cbindgen -cargo install --version 0.20.0 cbindgen +cargo install --version 0.21.0 cbindgen if [[ $CARCH == 'aarch64' ]]; then diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh index 0b81256..bcc8941 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.3'} +_SETTINGS_TAG=${SETTINGS_TAG:-'6.4'} _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball