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

[Jan de Groot]

    Date: Saturday, July 18, 2009 @ 08:03:17
  Author: jgc
Revision: 46447

Merged revisions 46369,46446 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xulrunner/trunk

........
  r46369 | jgc | 2009-07-16 20:54:57 +0200 (Thu, 16 Jul 2009) | 1 line
  
  Fix FS#15528 and FS#15393
........
  r46446 | jgc | 2009-07-18 14:02:38 +0200 (Sat, 18 Jul 2009) | 2 lines
  
  upgpkg: xulrunner 1.9.1.1-1
      Update to 3.5.1/1.9.1.1 - add patch to keep xulrunner-1.9.1.1 as installation directory
........

Added:
  xulrunner/repos/extra-x86_64/xulrunner-version.patch
    (from rev 46446, xulrunner/trunk/xulrunner-version.patch)
Modified:
  xulrunner/repos/extra-x86_64/	(properties)
  xulrunner/repos/extra-x86_64/PKGBUILD

-------------------------+
 PKGBUILD                |   21 +++++++++++++--------
 xulrunner-version.patch |   13 +++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)


Property changes on: xulrunner/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xulrunner/trunk:1-44370
   + /xulrunner/trunk:1-46446

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-07-18 12:02:38 UTC (rev 46446)
+++ extra-x86_64/PKGBUILD	2009-07-18 12:03:17 UTC (rev 46447)
@@ -2,13 +2,13 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xulrunner
-pkgver=1.9.1
-_ffoxver=3.5
-pkgrel=2
+pkgver=1.9.1.1
+_ffoxver=3.5.1
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.16.3' 'gcc-libs>=4.4.0' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.3' 'nspr>=4.8' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types')
+depends=('gtk2>=2.16.3' 'gcc-libs>=4.4.0' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.3' 'nspr>=4.8' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.80' 'alsa-lib>=1.0.20')
 makedepends=('zip' 'pkgconfig' 'diffutils' 'python' 'libgnomeui')
 optdepends=('libgnomeui')
 provides=(gecko-sdk)
@@ -20,17 +20,19 @@
         mozilla-pkgconfig.patch
         fix-mozilla-launcher.patch
         mozilla-ps-pdf-simplify-operators.patch
-        nsThreadUtils.patch)
-md5sums=('6dd59399db08963ef022a1d0e5010053'
+        nsThreadUtils.patch
+        xulrunner-version.patch)
+md5sums=('18169e189785d680827d4fce94524449'
          'ed5045e94a7ef2a2c7d0c8c54581cd63'
          '5efd6772ed0ecf8eddec5d5650191d3c'
          'd806ffcd9fa8d178ebfa9057c1221fbf'
          '63eee2d1da3b43c9d604f2253f242f40'
          '13dca58c04e62a8916691c63c5c492a0'
-         'ccc3a0672c783c043434f256fbd38c86')
+         'ccc3a0672c783c043434f256fbd38c86'
+         'd8a3066a3d9039b6f375316ed763e8f8')
 
 build() {
-  cd "${srcdir}/mozilla-${pkgver}"
+  cd "${srcdir}/mozilla-1.9.1"
   cp "${srcdir}/mozconfig" .mozconfig
 
   #Upstream patch. Still not applied to 1.9.0.1
@@ -48,6 +50,9 @@
   #Fix epiphany crashes - requires epiphany rebuild
   patch -Np1 -i "${srcdir}/nsThreadUtils.patch" || return 1
 
+  #Force installation to the same path for every version
+  patch -Np1 -i "${srcdir}/xulrunner-version.patch" || return 1
+
   unset CFLAGS
   unset CXXFLAGS
   export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-1.9.1"

Copied: xulrunner/repos/extra-x86_64/xulrunner-version.patch (from rev 46446, xulrunner/trunk/xulrunner-version.patch)
===================================================================
--- extra-x86_64/xulrunner-version.patch	                        (rev 0)
+++ extra-x86_64/xulrunner-version.patch	2009-07-18 12:03:17 UTC (rev 46447)
@@ -0,0 +1,13 @@
+diff -up mozilla/toolkit/mozapps/update/src/updater/module.ver mozilla/toolkit/mozapps/update/src/updater/module
+diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer/Makefile.in
+--- mozilla/xulrunner/installer/Makefile.in.ver	2007-12-14 09:51:34.000000000 +0100
++++ mozilla/xulrunner/installer/Makefile.in	2007-12-14 09:52:03.000000000 +0100
+@@ -44,6 +44,8 @@ VPATH		= @srcdir@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++MOZ_APP_VERSION="1.9.1"
++
+ NO_PKG_FILES = \
+ 	xulrunner-config \
+ 	regchrome* \