diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-24 10:22:01 +0100 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-24 10:22:01 +0100 |
| commit | 4d2d452fd14978449a98ecc9713f18e33b774376 (patch) | |
| tree | c17fbb64cf61fe60f593bea8277df917b7c4becf | |
| parent | sometimes, it's the little things.. (diff) | |
| download | librewolf-linux-4d2d452fd14978449a98ecc9713f18e33b774376.tar.gz librewolf-linux-4d2d452fd14978449a98ecc9713f18e33b774376.tar.bz2 librewolf-linux-4d2d452fd14978449a98ecc9713f18e33b774376.zip | |
enable SearchEngine policy for non-ESR Firefox; remove direct non-policy installation of ublock again
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rwxr-xr-x | scripts/02_configure_tarball.sh | 9 |
2 files changed, 7 insertions, 13 deletions
@@ -23,17 +23,14 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'speech-dispatcher: Text-to-Speech' 'hunspell-en_US: Spell checking, American English') options=(!emptydirs !makeflags !strip) -noextract=("ublock_origin-$ublockver-an+fx.xpi") source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz $pkgname.desktop "git+https://gitlab.com/${pkgname}-community/browser/common.git" - "git+https://gitlab.com/${pkgname}-community/settings.git" - "https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-$_ublockver-an+fx.xpi") + "git+https://gitlab.com/${pkgname}-community/settings.git") sha256sums=('74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a' '0471d32366c6f415f7608b438ddeb10e2f998498c389217cdd6cc52e8249996b' 'SKIP' - 'SKIP' - '997aac00064665641298047534c9392492ef09f0cbf177b6a30d4fa288081579') + 'SKIP') if [[ $CARCH == 'aarch64' ]]; then source+=(arm.patch @@ -124,6 +121,9 @@ fi # this one only to remove an annoying error message: sed -i 's#SaveToPocket.init();#// SaveToPocket.init();#g' browser/components/BrowserGlue.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 + rm -f ${srcdir}/common/source_files/mozconfig cp -r ${srcdir}/common/source_files/* ./ } @@ -237,7 +237,6 @@ pref("browser.shell.checkDefaultBrowser", false); pref("extensions.autoDisableScopes", 11); END - install -Dm644 "${srcdir}/ublock_origin-$ublockver-an+fx.xpi" "$pkgdir"/usr/lib/${pkgname}/browser/extensions/uBlock0@raymondhill.net.xpi cp -r ${srcdir}/settings/* ${pkgdir}/usr/lib/${pkgname}/ local distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" diff --git a/scripts/02_configure_tarball.sh b/scripts/02_configure_tarball.sh index 3bdbcaf..2b4d959 100755 --- a/scripts/02_configure_tarball.sh +++ b/scripts/02_configure_tarball.sh @@ -11,8 +11,6 @@ OUTPUT_TARBALL=$CI_PROJECT_DIR/LibreWolf.${CARCH}.tar.bz2 SOURCE_CODE_BINARY_TARBALL_LOCATION="$CI_PROJECT_DIR/src/firefox-*/obj*/dist/librewolf*.tar.bz2" EXTRACTED_TARBALL_FOLDER=$CI_PROJECT_DIR/librewolf_unpacked/librewolf -_ublockver=1.25.2 - # Prevents build from breaking in CI/CD environments export SHELL=/bin/bash @@ -29,7 +27,7 @@ tar -xf $OUTPUT_TARBALL -C librewolf_unpacked printf "\nCopying librewolf settings to extracted binary tarball\n" cp -r $CI_PROJECT_DIR/src/settings $EXTRACTED_TARBALL_FOLDER/settings # no need to keep that in there -rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git"; +rm -rf "${EXTRACTED_TARBALL_FOLDER}/settings/.git"; cp $CI_PROJECT_DIR/content/toggle-settings.sh $EXTRACTED_TARBALL_FOLDER/settings cp $CI_PROJECT_DIR/content/launch_librewolf.sh $EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh @@ -37,10 +35,7 @@ cp $CI_PROJECT_DIR/content/launch_librewolf.sh $EXTRACTED_TARBALL_FOLDER/launch_ # until we've worked out how to use `--install-settings` with links # in all major packages instead printf "\nWorkaround: auto-enable Settings\n" -cp -r $_EXTRACTED_TARBALL_FOLDER/settings/* $_EXTRACTED_TARBALL_FOLDER; - -printf "\nAdd uBlock origin\n" -install -Dm644 "$CI_PROJECT_DIR/ublock_origin-$_ublockver-an+fx.xpi" "$EXTRACTED_TARBALL_FOLDER"/browser/extensions/uBlock0@raymondhill.net.xpi +cp -r $EXTRACTED_TARBALL_FOLDER/settings/* $EXTRACTED_TARBALL_FOLDER; # Repacks the binary tarball printf "\nRecompressing binary tarball\n" |