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

[Ionut Biru]

    Date: Tuesday, June 22, 2010 @ 16:43:16
  Author: ibiru
Revision: 83770

upgpkg: firefox 3.6.4-1
update to 3.6.4

Modified:
  firefox/trunk/PKGBUILD

----------+
 PKGBUILD |   29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-22 20:42:25 UTC (rev 83769)
+++ PKGBUILD	2010-06-22 20:43:16 UTC (rev 83770)
@@ -2,15 +2,14 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=3.6.3
+pkgver=3.6.4
 pkgrel=1
-_xulver=1.9.2.3
+_xulver=1.9.2.4
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=("xulrunner=${_xulver}" 'desktop-file-utils')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python' 'wireless_tools')
-replaces=('firefox3')
+makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui>=2.24.1' 'python' 'wireless_tools')
 install=firefox.install
 url="http://www.mozilla.org/projects/firefox"
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
@@ -21,10 +20,10 @@
         browser-defaulturls.patch
         firefox-version.patch
 	firefox-agent.patch)
-md5sums=('5e4541ab23084b7b14ba228291ce2688'
+md5sums=('66b1610362ed6009d66fe762645679a0'
          '1e4283a24953f8d0c6a5c00a36ae0981'
          'ba96924ece1d77453e462429037a2ce5'
-         '5e68cabfcf3c021806b326f664ac505e'
+         '6f38a5899034b7786cb1f75ad42032b8'
          'bd5db57c23c72a02a489592644f18995'
          '1807651225b021e043154f8bba715a19'
          '92c11c66dd69b03f214002fededd1fc8'
@@ -32,10 +31,10 @@
 
 build() {
   cd "${srcdir}/mozilla-1.9.2"
-  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" || return 1
-  patch -Np1 -i "${srcdir}/browser-defaulturls.patch" || return 1
-  patch -Np1 -i "${srcdir}/firefox-version.patch" || return 1
-  patch -Np1 -i "${srcdir}/firefox-agent.patch" || return 1
+  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
+  patch -Np1 -i "${srcdir}/browser-defaulturls.patch"
+  patch -Np1 -i "${srcdir}/firefox-version.patch"
+  patch -Np1 -i "${srcdir}/firefox-agent.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
   unset CFLAGS
@@ -43,13 +42,13 @@
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.6"
 
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
-  make -j1 DESTDIR="${pkgdir}" install || return 1
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+  make -j1 DESTDIR="${pkgdir}" install
 
   rm -f ${pkgdir}/usr/lib/firefox-3.6/libjemalloc.so
 
   install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 ${srcdir}/mozilla-1.9.2/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1
-  install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/ || return 1
-  install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/ || return 1
+  install -m644 ${srcdir}/mozilla-1.9.2/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png
+  install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/
+  install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/
 }