diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2021-01-31 11:51:25 +0100 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2021-01-31 11:51:25 +0100 |
| commit | e81be4dfbb6eac35bdda76c963d4bf7c36f96536 (patch) | |
| tree | 94685975e9e1d220cd749d7748344278de6cf92b /binary_tarball | |
| parent | 85.0-1 – get Arch build ready (diff) | |
| download | librewolf-linux-e81be4dfbb6eac35bdda76c963d4bf7c36f96536.tar.gz librewolf-linux-e81be4dfbb6eac35bdda76c963d4bf7c36f96536.tar.bz2 librewolf-linux-e81be4dfbb6eac35bdda76c963d4bf7c36f96536.zip | |
allow building without the global menubar; remove some leftover stuff from the arch build script; adjust ids in tarball scripts as well
Diffstat (limited to 'binary_tarball')
| -rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 6 | ||||
| -rwxr-xr-x | binary_tarball/scripts/4_Build_Binary_Tarball.sh | 2 | ||||
| -rwxr-xr-x | binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 2 |
3 files changed, 6 insertions, 4 deletions
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" <<END [Global] -id=io.gitlab.LibreWolf +id=io.gitlab.librewolf-community version=1.0 about=LibreWolf |