[arch-commits] Commit in firefox/trunk (PKGBUILD)

[Jan Steffens]

    Date: Monday, August 27, 2012 @ 17:21:54
  Author: heftig
Revision: 165641

15.0

Modified:
  firefox/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-27 20:36:11 UTC (rev 165640)
+++ PKGBUILD	2012-08-27 21:21:54 UTC (rev 165641)
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=14.0.1
+pkgver=15.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@
 options=(!emptydirs)
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
-md5sums=('c2f884f0f6c41c65cf20f678a1ee7191'
+md5sums=('64220887a349515f16e5aa990acb4db3'
          '5644c7b42f51013e2023787938fa955e'
          'bdeb0380c7fae30dd0ead6d2d3bc5873'
          '594523c536a9be951b52c90dd85aff18'
@@ -36,7 +36,7 @@
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
-  
+
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/firefox"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -46,17 +46,19 @@
   export MOZ_PGO=1
   export DISPLAY=:99
   Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+  _fail=0
 
-  make -f client.mk build
+  make -f client.mk build || _fail=1
 
   kill $! || true
+  return $_fail
 }
 
 package() {
   cd mozilla-release
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
-  install -m644 ../vendor.js "$pkgdir/usr/lib/firefox/defaults/pref"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/firefox/defaults/preferences/vendor.js"
 
   for i in 16 22 24 32 48 256; do
       install -Dm644 browser/branding/official/default$i.png \