diff options
| author | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-19 20:22:05 -0300 |
|---|---|---|
| committer | Márcio Alexandre Silva Delgado <coadde@lavabit.com> | 2013-05-19 20:22:05 -0300 |
| commit | 39c5e13b513807ef86e8711cad763877b28f5af8 (patch) | |
| tree | 172dceb50864aa1cca40d73b52ead4f72f81003e /libre/iceweasel-libre/PKGBUILD | |
| parent | e70153d29313ea63a68bd0bdfbb616d1fc154b5a (diff) | |
| parent | 6f996e70504c07e829810b4e0bf6571c137d1bbd (diff) | |
| download | abslibre-39c5e13b513807ef86e8711cad763877b28f5af8.tar.gz abslibre-39c5e13b513807ef86e8711cad763877b28f5af8.tar.bz2 abslibre-39c5e13b513807ef86e8711cad763877b28f5af8.zip | |
Merge ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/iceweasel-libre/PKGBUILD')
| -rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 97501a647..738aaeef9 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=2 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -142,13 +142,12 @@ build() { if $_pgo; then export DISPLAY=:99 Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - - if ! make -f client.mk build MOZ_PGO=1; then - kill $! - return 1 - fi + _fail=0 + + make -f client.mk build MOZ_PGO=1 || _fail=1 kill $! || true + return $_fail else make -f client.mk build fi @@ -173,9 +172,11 @@ package() { install -d "$pkgdir/usr/share/applications" install -m644 "$srcdir/iceweasel.desktop" "$pkgdir/usr/share/applications" - rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} + rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation} ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" + + rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins} ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" |