[arch-commits] Commit in firefox/repos (3 files)

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 09:24:45
  Author: jgc
Revision: 46468

Merged revisions 46444 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/firefox/trunk

........
  r46444 | jgc | 2009-07-18 13:50:35 +0200 (Sat, 18 Jul 2009) | 2 lines
  
  upgpkg: firefox 3.5.1-1
      Update to 3.5.1 - add patch to keep firefox-3.5 as installation directory
........

Added:
  firefox/repos/extra-i686/firefox-version.patch
    (from rev 46444, firefox/trunk/firefox-version.patch)
Modified:
  firefox/repos/extra-i686/	(properties)
  firefox/repos/extra-i686/PKGBUILD

-----------------------+
 PKGBUILD              |   17 ++++++++++-------
 firefox-version.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)


Property changes on: firefox/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /firefox/trunk:1-44683
   + /firefox/trunk:1-46467

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-18 13:17:42 UTC (rev 46467)
+++ extra-i686/PKGBUILD	2009-07-18 13:24:45 UTC (rev 46468)
@@ -2,9 +2,9 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=3.5
+pkgver=3.5.1
 pkgrel=1
-_xulver=1.9.1
+_xulver=1.9.1.1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
@@ -18,18 +18,21 @@
         firefox.desktop
         firefox-safe.desktop
         mozilla-firefox-1.0-lang.patch
-        browser-defaulturls.patch)
-md5sums=('6dd59399db08963ef022a1d0e5010053'
+        browser-defaulturls.patch
+        firefox-version.patch)
+md5sums=('18169e189785d680827d4fce94524449'
          'd672df11a6e16a5dec68428b00bfb810'
          '68cf02788491c6e846729b2f2913bf79'
          '5e68cabfcf3c021806b326f664ac505e'
          'bd5db57c23c72a02a489592644f18995'
-         '346d74ec560e7bbf453c02ff21f4b868')
+         '346d74ec560e7bbf453c02ff21f4b868'
+         '1dd9a10df0b9e4cf332eadc326d78e07')
 
 build() {
-  cd "${srcdir}/mozilla-${_xulver}"
+  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
 
   cp "${srcdir}/mozconfig" .mozconfig
   unset CFLAGS
@@ -44,7 +47,7 @@
 
   install -m755 -d ${pkgdir}/usr/share/applications
   install -m755 -d ${pkgdir}/usr/share/pixmaps
-  install -m644 ${srcdir}/mozilla-${_xulver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1
+  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
 }

Copied: firefox/repos/extra-i686/firefox-version.patch (from rev 46444, firefox/trunk/firefox-version.patch)
===================================================================
--- extra-i686/firefox-version.patch	                        (rev 0)
+++ extra-i686/firefox-version.patch	2009-07-18 13:24:45 UTC (rev 46468)
@@ -0,0 +1,11 @@
+--- mozilla-1.9.1/browser/installer/Makefile.in.ver	2009-07-18 13:32:35.000000000 +0200
++++ mozilla-1.9.1/browser/installer/Makefile.in	2009-07-18 13:33:12.000000000 +0200
+@@ -43,6 +43,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++MOZ_APP_VERSION="3.5"
++
+ NO_PKG_FILES = \
+ 	$(MOZ_APP_NAME)-config \
+ 	$(MOZ_APP_NAME)-bin.elf \