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

[Jan de Groot]

    Date: Wednesday, November 19, 2008 @ 17:00:22
  Author: jgc
Revision: 19296

Merged revisions 19269,19295 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/firefox/trunk

........
  r19269 | dan | 2008-11-19 03:27:01 +0100 (Wed, 19 Nov 2008) | 1 line
  
  Maintainer no more
........
  r19295 | jgc | 2008-11-19 23:00:00 +0100 (Wed, 19 Nov 2008) | 3 lines
  
  upgpkg: firefox 3.0.4-1
      Upstream security update.
  Install in /usr/lib/firefox-3.0 instead of $pkgver (FS#11769)
........

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

--------------------------+
 PKGBUILD                 |   21 ++++++++++++---------
 firefox-appversion.patch |   11 +++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)


Property changes on: firefox/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /firefox/trunk:1-14116
   + /firefox/trunk:1-19295

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-19 22:00:00 UTC (rev 19295)
+++ extra-i686/PKGBUILD	2008-11-19 22:00:22 UTC (rev 19296)
@@ -1,15 +1,14 @@
 # $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=3.0.3
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
-depends=('xulrunner>=1.9.0.3-1' 'desktop-file-utils' 'mime-types' 'shared-mime-info')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.22.1' 'python' 'xorg-server')
+depends=('xulrunner=1.9.0.4' 'desktop-file-utils' 'shared-mime-info')
+makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.0' 'python' 'xorg-server')
 replaces=('firefox3')
 install=firefox.install
 url="http://www.mozilla.org/projects/firefox"
@@ -19,14 +18,16 @@
         firefox-safe.desktop
         mozilla-firefox-1.0-lang.patch
 	mozilla-firstrun.patch
-	mozbug421977.patch)
-md5sums=('e076a4a889fce0c4ca237ac30bfadb43'
+	mozbug421977.patch
+	firefox-appversion.patch)
+md5sums=('8a1ac4a5940108a96458c5307a74c98d'
          '8b6e5f7d0a9e3f64747a024cf8f12069'
          '68cf02788491c6e846729b2f2913bf79'
          '5e68cabfcf3c021806b326f664ac505e'
          'bd5db57c23c72a02a489592644f18995'
          '42af09c0200b752ac7f7d639b3a2947b'
-         '7976e3ff52e01af3388dfc3a479c4955')
+         '7976e3ff52e01af3388dfc3a479c4955'
+	 'c6f27fca2e6bd2a570b271ec3ce35782')
 
 build() {
   cd ${srcdir}/mozilla
@@ -37,12 +38,14 @@
   # FS#10836: fixes backgroundcolor parsing with gnome
   patch -Np0 -i ${srcdir}/mozbug421977.patch || return 1
 
+  patch -Np1 -i ${srcdir}/firefox-appversion.patch || return 1
+
   cp ${srcdir}/mozconfig .mozconfig
 
   unset CFLAGS
   unset CXXFLAGS
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-${pkgver}"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.0"
 
   LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 &
   XPID=$!
@@ -53,7 +56,7 @@
 
   make -j1 DESTDIR=${pkgdir} -C ff-opt-obj install || return 1
 
-  rm -f ${pkgdir}/usr/lib/firefox-${pkgver}/libjemalloc.so
+  rm -f ${pkgdir}/usr/lib/firefox-3.0/libjemalloc.so
 
   install -m755 -d ${pkgdir}/usr/share/applications
   install -m755 -d ${pkgdir}/usr/share/pixmaps

Copied: firefox/repos/extra-i686/firefox-appversion.patch (from rev 19295, firefox/trunk/firefox-appversion.patch)
===================================================================
--- extra-i686/firefox-appversion.patch	                        (rev 0)
+++ extra-i686/firefox-appversion.patch	2008-11-19 22:00:22 UTC (rev 19296)
@@ -0,0 +1,11 @@
+--- mozilla/browser/installer/Makefile.in.orig	2008-11-19 22:49:15.000000000 +0100
++++ mozilla/browser/installer/Makefile.in	2008-11-19 22:49:32.000000000 +0100
+@@ -43,6 +43,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++MOZ_APP_VERSION=3.0
++
+ NO_PKG_FILES = \
+ 	$(MOZ_APP_NAME)-config \
+ 	$(MOZ_APP_NAME)-bin.elf \