diff options
Diffstat (limited to 'binary_tarball/scripts')
| -rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 17 | ||||
| -rwxr-xr-x | binary_tarball/scripts/4_Build_Binary_Tarball.sh | 2 | ||||
| -rwxr-xr-x | binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 4 |
3 files changed, 19 insertions, 4 deletions
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 37a6ae5..2fc0dcf 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 @@ -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" @@ -130,6 +133,11 @@ 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 +if [[ ! -z "${GLOBAL_MENUBAR}" ]];then + patch -p1 -i ${CI_PROJECT_DIR}/unity-menubar.patch +fi + # Disabling Pocket printf "\nDisabling Pocket\n"; sed -i "s/'pocket'/#'pocket'/g" browser/components/moz.build @@ -145,3 +153,10 @@ 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) +_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 +sed "$_settings_services_sed" -i toolkit/components/search/SearchUtils.jsm 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 04bc086..56d33ad 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=640b375dc02c5b089f678ed16b0232d1c0cc0721 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball @@ -42,7 +42,7 @@ distini="$_EXTRACTED_TARBALL_FOLDER/distribution/distribution.ini" install -Dvm644 /dev/stdin "$distini" <<END [Global] -id=io.gitlab.LibreWolf +id=io.gitlab.librewolf-community version=1.0 about=LibreWolf |