From 6df64d7560eb595b9c40ef9f12ebbab504510717 Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sun, 10 Oct 2021 13:46:22 +0200 Subject: [PATCH] bb -> gnu patch --- scripts/1_Install_Dependencies.sh | 2 +- scripts/2_Download_Source_Code.sh | 3 ++- scripts/3_Configure_Source_Code.sh | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/1_Install_Dependencies.sh b/scripts/1_Install_Dependencies.sh index 9f1cad3..f5cef45 100755 --- a/scripts/1_Install_Dependencies.sh +++ b/scripts/1_Install_Dependencies.sh @@ -5,7 +5,7 @@ set -e # Setup Script Variables _DEPENDENCIES="wget git xorg-server-xvfb \ - xz grep coreutils \ + xz grep coreutils patch \ gettext \ curl python3 libjack \ python3-psutil python3-devel python-devel \ diff --git a/scripts/2_Download_Source_Code.sh b/scripts/2_Download_Source_Code.sh index 6364dd2..8430a37 100755 --- a/scripts/2_Download_Source_Code.sh +++ b/scripts/2_Download_Source_Code.sh @@ -9,7 +9,8 @@ if [[ -z ${pkgver} || -z ${pkgrel} ]]; then fi # Setup Script Variables SOURCE_FOLDER=$1; -_SOURCE_CODE_URL="https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz"; +#_SOURCE_CODE_URL="https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz"; +_SOURCE_CODE_URL="https://f.sakamoto.pl/firefox-$pkgver.source.tar.xz"; _SOURCE_TAR="firefox-${pkgver}.tar.xz" # Downloading and Extracting Firefox Source Code diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh index e12357a..c263282 100755 --- a/scripts/3_Configure_Source_Code.sh +++ b/scripts/3_Configure_Source_Code.sh @@ -6,7 +6,8 @@ set -e # Setup Script Variables srcdir=$1; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} -_COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; +#_COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; +_COMMON_REPO='https://git.sakamoto.pl/domi/librewolf-common.git'; _PKGVER_TAG="v${pkgver}-${pkgrel}" _COMMON_TAG=${COMMON_TAG:-${_PKGVER_TAG}} _COMMON_DIR="${CI_PROJECT_DIR}"/common @@ -150,7 +151,7 @@ patch -Np1 -i ${_PATCHES_DIR}/remove_addons.patch patch -Np1 -i ${_PATCHES_DIR}/megabar.patch # remove mozilla vpn ads -#patch -Np1 -i ${_PATCHES_DIR}/mozilla-vpn-ad.patch +patch -Np1 -i ${_PATCHES_DIR}/mozilla-vpn-ad.patch # Debian patch to enable global menubar if [[ ! -z "${GLOBAL_MENUBAR}" ]];then