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

[Ionut Biru]

    Date: Sunday, August 14, 2011 @ 07:23:30
  Author: ibiru
Revision: 135505

update to 6.0

Modified:
  firefox/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-14 10:26:15 UTC (rev 135504)
+++ PKGBUILD	2011-08-14 11:23:30 UTC (rev 135505)
@@ -2,7 +2,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=5.0
+pkgver=6.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
@@ -11,13 +11,14 @@
          'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib'
          'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils' 'libvpx'
          'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm'
+makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm'
              'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
+options=(!buildflags)
 url="http://www.mozilla.org/projects/firefox"
 install=firefox.install
-source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//${pkgver}/source/firefox-${pkgver}.source.tar.bz2
         mozconfig firefox.desktop mozilla-firefox-1.0-lang.patch)
-md5sums=('9f64a01e86a5d424e12a8e3305c5debe'
+md5sums=('1840185865a1a8975df4a3db59080ddc'
          '5eb9abbd2591ee337981024008d93988'
          'bdeb0380c7fae30dd0ead6d2d3bc5873'
          'bd5db57c23c72a02a489592644f18995')
@@ -31,12 +32,8 @@
   # Kill @PRE_RELEASE_SUFFIX@ from browser.xul because it
   # gets set to \177 for an unknown reason
   sed -i 's/@PRE_RELEASE_SUFFIX@//g' \
-    browser/base/content/browser.xul
+      browser/base/content/browser.xul
 
-  # Don't generate startup cache. Unbreaks build
-  sed -i 's/^GENERATE_CACHE .*/GENERATE_CACHE = true/' \
-    toolkit/mozapps/installer/packager.mk
-
   export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
   export PYTHON="/usr/bin/python2"
 
@@ -56,7 +53,7 @@
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 other-licenses/branding/firefox/default${i/x*/}.png \
+      install -Dm644 browser/branding/official/default${i/x*/}.png \
         "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"
   done