diff options
| author | root <root@rshg054.dnsready.net> | 2013-05-20 00:57:43 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-05-20 00:57:43 -0700 |
| commit | 383955a81810f344e11b1472bd4c5069fa77020c (patch) | |
| tree | 6017ed943ee9ae2ca0da830ede5f00f6d7817cf7 /libre/iceweasel-libre | |
| parent | 9a30c3d0083b8330b1aa6c0f89245e68ae762ee5 (diff) | |
Mon May 20 00:57:42 PDT 2013
Diffstat (limited to 'libre/iceweasel-libre')
| -rw-r--r-- | libre/iceweasel-libre/PKGBUILD | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 97501a647..253572553 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,11 +172,13 @@ 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" - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" + + rm -rf "$pkgdir/usr/lib/$_pkgname/browser/"{searchplugins,plugins} + ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/browser/plugins" + ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/browser/searchplugins" # We don't want the development stuff rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} |