From b16649c00031b8c24bbe44a6891b1cc0939b87a6 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Mon, 4 Jan 2021 23:18:23 +0100 Subject: Block some more undesired requests See https://gitlab.com/librewolf-community/browser/common/-/issues/10 --- binary_tarball/scripts/3_Configure_Source_Code.sh | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'binary_tarball/scripts') diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 37a6ae5..7d8a12f 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -145,3 +145,9 @@ sed -z "$_cert_sed" -i toolkit/mozapps/extensions/internal/XPIInstall.jsm # allow SearchEngines option in non-ESR builds sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json + +# stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10) +sed "$_settings_services_sed" -i browser/components/newtab/data/content/activity-stream.bundle.js +sed "$_settings_services_sed" -i modules/libpref/init/all.js +sed "$_settings_services_sed" -i services/settings/Utils.jsm +sed "$_settings_services_sed" -i toolkit/components/search/SearchUtils.jsm -- cgit From b8c8f7ee1297752e4577528a3dd26802672bc5cf Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Fri, 8 Jan 2021 20:44:53 +0100 Subject: add patch to binary_tarball script as well --- binary_tarball/scripts/3_Configure_Source_Code.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'binary_tarball/scripts') diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 7d8a12f..16fd4fc 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -130,6 +130,9 @@ patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch # Adapted from https://github.com/WesleyBranton/userChrome.css-Customizations patch -p1 -i ${CI_PROJECT_DIR}/megabar.patch +# Debian patch to enable global menubar +patch -p1 -i ${CI_PROJECT_DIR}/unity-menubar.patch + # Disabling Pocket printf "\nDisabling Pocket\n"; sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build -- cgit From 60cbb0acf5b36795d49a6d3e26a82ade456c26ee Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Wed, 20 Jan 2021 15:28:10 +0100 Subject: fix flatpak/appimage releases using old settings --- binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'binary_tarball/scripts') diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index 04bc086..f589495 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/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_COMMIT=2f76ae07f7016034273f1887b7f1bedab997909c +_SETTINGS_COMMIT=0d0cd76c4465b4be11a3460ae4bcee3500e665e4 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball -- cgit From 11d4b95742fda004b62ad780056ab99337477d6b Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Wed, 27 Jan 2021 10:57:18 +0100 Subject: fix missing sed-line for undesired requests --- binary_tarball/scripts/3_Configure_Source_Code.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'binary_tarball/scripts') diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 16fd4fc..c46efcc 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -150,6 +150,7 @@ sed -z "$_cert_sed" -i toolkit/mozapps/extensions/internal/XPIInstall.jsm sed -i 's#"enterprise_only": true,#"enterprise_only": false,#g' browser/components/enterprisepolicies/schemas/policies-schema.json # stop some undesired requests (https://gitlab.com/librewolf-community/browser/common/-/issues/10) +_settings_services_sed='s#firefox.settings.services.mozilla.com#f.s.s.m.c.qjz9zk#g' sed "$_settings_services_sed" -i browser/components/newtab/data/content/activity-stream.bundle.js sed "$_settings_services_sed" -i modules/libpref/init/all.js sed "$_settings_services_sed" -i services/settings/Utils.jsm -- cgit From e4852c50502d0e0bdd3d89ee18d74c4f70f1b8ca Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Wed, 27 Jan 2021 16:21:45 +0100 Subject: 85.0-1 – get Arch build ready MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'binary_tarball/scripts') diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index f589495..706126b 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/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_COMMIT=0d0cd76c4465b4be11a3460ae4bcee3500e665e4 +_SETTINGS_COMMIT=640b375dc02c5b089f678ed16b0232d1c0cc0721 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball -- cgit From e81be4dfbb6eac35bdda76c963d4bf7c36f96536 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Sun, 31 Jan 2021 11:51:25 +0100 Subject: allow building without the global menubar; remove some leftover stuff from the arch build script; adjust ids in tarball scripts as well --- binary_tarball/scripts/3_Configure_Source_Code.sh | 6 ++++-- binary_tarball/scripts/4_Build_Binary_Tarball.sh | 2 +- binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'binary_tarball/scripts') diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index c46efcc..829c803 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -41,7 +41,7 @@ ac_add_options --enable-update-channel=release ac_add_options --with-app-name=librewolf ac_add_options --with-app-basename=LibreWolf ac_add_options --with-branding=browser/branding/librewolf -ac_add_options --with-distribution-id=io.gitlab.librewolf +ac_add_options --with-distribution-id=io.gitlab.librewolf-community ac_add_options --with-unsigned-addon-scopes=app,system ac_add_options --allow-addon-sideload export MOZ_REQUIRE_SIGNING=0 @@ -131,7 +131,9 @@ patch -p1 -i ${CI_PROJECT_DIR}/remove_addons.patch patch -p1 -i ${CI_PROJECT_DIR}/megabar.patch # Debian patch to enable global menubar -patch -p1 -i ${CI_PROJECT_DIR}/unity-menubar.patch +if [[ ! -z "${GLOBAL_MENUBAR}" ]];then + patch -p1 -i ${CI_PROJECT_DIR}/unity-menubar.patch +fi # Disabling Pocket printf "\nDisabling Pocket\n"; diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh index bfd536c..4e1a9e4 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh @@ -64,7 +64,7 @@ rm -f mozconfig # source /root/.cargo/env # install cbindgen -cargo install --version 0.15.0 cbindgen +cargo install --version 0.16.0 cbindgen if [[ $CARCH == 'aarch64' ]]; then diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index 706126b..56d33ad 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -42,7 +42,7 @@ distini="$_EXTRACTED_TARBALL_FOLDER/distribution/distribution.ini" install -Dvm644 /dev/stdin "$distini" < Date: Mon, 1 Feb 2021 13:29:58 +0100 Subject: test building tarball with some very preliminary patches --- binary_tarball/scripts/3_Configure_Source_Code.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'binary_tarball/scripts') diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 829c803..2fc0dcf 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -117,6 +117,9 @@ patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/armhf-reduce-linker-memory-use.patch patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/build-with-libstdc++-7.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/fix-armhf-webrtc-build.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/webrtc-fix-compiler-flags-for-armhf.patch" +patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/reduce-rust-debuginfo.patch" +patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/relax-cargo-dep.patch" +patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/use-system-icupkg.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-variable-annotations.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-fstrings.patch" patch -p1 -i "${CI_PROJECT_DIR}/deb_patches/python3-remove-pep487.patch" -- cgit