This commit is contained in:
ohfp 2022-05-05 10:24:01 +02:00
parent eac4c04053
commit bf4e1d35f9
4 changed files with 10 additions and 11 deletions

View file

@ -8,7 +8,7 @@ _DEPENDENCIES="wget git xvfb \
xz-utils \ xz-utils \
gettext-base \ gettext-base \
curl python3 libjack-dev \ curl python3 libjack-dev \
python3-psutil python-psutil python3-dev python-dev \ python3-dev python-dev \
gnupg \ gnupg \
autotools-dev \ autotools-dev \
autoconf2.13 \ autoconf2.13 \

View file

@ -114,9 +114,6 @@ END
export RUSTFLAGS="-Cdebuginfo=0" export RUSTFLAGS="-Cdebuginfo=0"
export LDFLAGS+=" -Wl,--no-keep-memory -Wl" 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 else
cat >>${CI_PROJECT_DIR}/mozconfig <<END cat >>${CI_PROJECT_DIR}/mozconfig <<END
@ -181,10 +178,6 @@ cp "${_SOURCE_REPO_DIR}/assets/search-config.json" services/settings/dumps/main/
# stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10) # stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10)
patch -Np1 -i "${_PATCHES_DIR}/sed-patches/stop-undesired-requests2.patch" patch -Np1 -i "${_PATCHES_DIR}/sed-patches/stop-undesired-requests2.patch"
# allow overriding the color scheme light/dark preference with RFP
# deprecated / will be dropped soon
# patch -Np1 -i ${_PATCHES_DIR}/allow_dark_preference_with_rfp.patch
# change some hardcoded directory strings that could lead to unnecessarily # change some hardcoded directory strings that could lead to unnecessarily
# created directories # created directories
patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch
@ -193,6 +186,9 @@ patch -Np1 -i ${_PATCHES_DIR}/mozilla_dirs.patch
# should not break things, buuuuuuuuuut we'll see. # should not break things, buuuuuuuuuut we'll see.
patch -Np1 -i ${_PATCHES_DIR}/dbus_name.patch patch -Np1 -i ${_PATCHES_DIR}/dbus_name.patch
# add v100 about dialog
patch -Np1 -i ${_PATCHES_DIR}/aboutLogos.patch
# allow uBlockOrigin to run in private mode by default, without user intervention. # allow uBlockOrigin to run in private mode by default, without user intervention.
patch -Np1 -i ${_PATCHES_DIR}/allow-ubo-private-mode.patch patch -Np1 -i ${_PATCHES_DIR}/allow-ubo-private-mode.patch
@ -235,6 +231,9 @@ patch -Np1 -i ${_PATCHES_DIR}/ui-patches/remove-snippets-from-home.patch
# add warning that sanitizing exceptions are bypassed by the options in History > Clear History when LibreWolf closes > Settings # add warning that sanitizing exceptions are bypassed by the options in History > Clear History when LibreWolf closes > Settings
patch -Np1 -i ${_PATCHES_DIR}/ui-patches/sanitizing-description.patch 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 # pref pane
patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch patch -Np1 -i ${_PATCHES_DIR}/librewolf-pref-pane.patch

View file

@ -42,7 +42,7 @@ fi
export MOZ_NOSPAM=1 export MOZ_NOSPAM=1
export MOZBUILD_STATE_PATH="${_MOZBUILD}" export MOZBUILD_STATE_PATH="${_MOZBUILD}"
export MACH_USE_SYSTEM_PYTHON=1 export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
if [[ $CARCH == 'aarch64' ]]; then if [[ $CARCH == 'aarch64' ]]; then
export MOZ_DEBUG_FLAGS=" " export MOZ_DEBUG_FLAGS=" "
@ -70,7 +70,7 @@ cd $srcdir;
rm -f mozconfig rm -f mozconfig
# install cbindgen # install cbindgen
cargo install --version 0.20.0 cbindgen cargo install --version 0.21.0 cbindgen
if [[ $CARCH == 'aarch64' ]]; then if [[ $CARCH == 'aarch64' ]]; then

View file

@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
_SCRIPT_FOLDER=$(realpath $(dirname $0)); _SCRIPT_FOLDER=$(realpath $(dirname $0));
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; _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'; _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball # Extracts the binary tarball