firefox: upgrade

1 files changed, 32 insertions, 52 deletions

diff --git a/abs/extra/community/firefox/PKGBUILD b/abs/extra/community/firefox/PKGBUILD
index 17a70b3..a450301 100644
--- a/abs/extra/community/firefox/PKGBUILD
+++ b/abs/extra/community/firefox/PKGBUILD
@@ -1,77 +1,57 @@
-# $Id: PKGBUILD 46468 2009-07-18 13:24:45Z jgc $
+# $Id: PKGBUILD 97212 2010-10-27 20:58:06Z ibiru $
 # Contributor: Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox
-pkgver=3.5.1
-pkgrel=4
-_xulver=1.9.1.1
+pkgver=3.6.12
+pkgrel=1
+_xulver=1.9.2.12
 pkgdesc="Standalone web browser from mozilla.org"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8" gconf)
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python')
-replaces=('firefox3')
+depends=("xulrunner=${_xulver}" 'desktop-file-utils')
+makedepends=('zip' 'pkg-config' 'diffutils' 'libgnomeui>=2.24.1' 'python2' 'wireless_tools' 'autoconf2.13')
 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
+source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
         mozconfig
         firefox.desktop
         firefox-safe.desktop
         mozilla-firefox-1.0-lang.patch
         browser-defaulturls.patch
         firefox-version.patch
-	browser-app-makefile.patch
-	http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz)
-md5sums=('18169e189785d680827d4fce94524449'
-         '3c928b11918d22377eba01de34debc19'
-         '68cf02788491c6e846729b2f2913bf79'
-         '5e68cabfcf3c021806b326f664ac505e'
+	firefox-agent.patch
+        python2.7.patch)
+md5sums=('80f4d83f23a7c45fc3f1904964ea2a5a'
+         'ca385167401b98ef7adc6529e4b53205'
+         'ba96924ece1d77453e462429037a2ce5'
+         '6f38a5899034b7786cb1f75ad42032b8'
          'bd5db57c23c72a02a489592644f18995'
-         '346d74ec560e7bbf453c02ff21f4b868'
-         '1dd9a10df0b9e4cf332eadc326d78e07'
-         '165c43a5b03a0bf7ad2e7210b0d8c82c'
-         '6306980e40a3266b4b6c173bfcfdc946')
+         '1807651225b021e043154f8bba715a19'
+         '92c11c66dd69b03f214002fededd1fc8'
+         'f437e94acff8f810991271ef4677d859'
+         'ab3dc9aecae7f08b9492fb3c00a5fd28')
 
 build() {
-  cd "${srcdir}/mozilla-1.9.1"
-  patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" || return 1
-  patch -Np0 -i "${srcdir}/browser-defaulturls.patch" || return 1
-  patch -Np1 -i "${srcdir}/firefox-version.patch" || return 1
+  cd "${srcdir}/mozilla-1.9.2"
+  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"
+  patch -Np0 -i "${srcdir}/python2.7.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
   unset CFLAGS
   unset CXXFLAGS
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.5"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.6"
 
-  make -j1 -f client.mk configure MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1
-  cd browser/app
-  patch -p2 < "${srcdir}/browser-app-makefile.patch" || return 1
-  cd ../..
-  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.5/libjemalloc.so
+  rm -f ${pkgdir}/usr/lib/firefox-3.6/libjemalloc.so
 
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 ${srcdir}/mozilla-1.9.1/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 the flash player plugin.
-
-  mkdir -p ${pkgdir}/usr/lib/firefox-3.5/plugins
-  install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/firefox-3.5/plugins || return 1
-
-  # This is to stop firefox from crashing when the flashplayer (youtube) is 
-  # set to full screen. To test if it is still necessary with updates to 
-  # this package, run /usr/bin/firefox.bin without setting the LD_PRELOAD var.
-
-  mv ${pkgdir}/usr/bin/firefox ${pkgdir}/usr/bin/firefox.bin
-  echo "#!/bin/bash
-/usr/lib/GConf/gconfd-2 &
-export LD_PRELOAD=/usr/lib/libGL.so.1
-/usr/bin/firefox.bin" > ${pkgdir}/usr/bin/firefox
-  chmod 755 ${pkgdir}/usr/bin/firefox
+  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
+  install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/
+  install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/
 }