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

[Jan de Groot]

    Date: Friday, October 30, 2009 @ 09:00:15
  Author: jgc
Revision: 56906

Merged revisions 56836 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xulrunner/trunk

........
  r56836 | jgc | 2009-10-28 11:15:39 +0100 (Wed, 28 Oct 2009) | 2 lines
  
  upgpkg: xulrunner 1.9.1.4-1
      Update to 3.5.4, Remove lcms stuff from mozconfig, mozilla uses qcms now. Apply LDFLAGS from makepkg.conf to build
........

Modified:
  xulrunner/repos/extra-i686/	(properties)
  xulrunner/repos/extra-i686/PKGBUILD
  xulrunner/repos/extra-i686/mozconfig

-----------+
 PKGBUILD  |   14 +++++++-------
 mozconfig |    2 --
 2 files changed, 7 insertions(+), 9 deletions(-)


Property changes on: xulrunner/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xulrunner/trunk:1-56393
   + /xulrunner/trunk:1-56905

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-30 09:40:43 UTC (rev 56905)
+++ extra-i686/PKGBUILD	2009-10-30 13:00:15 UTC (rev 56906)
@@ -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.3
-_ffoxver=3.5.3
-pkgrel=2
+pkgver=1.9.1.4
+_ffoxver=3.5.4
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.18.3' 'gcc-libs>=4.4.1' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.4' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.80' 'alsa-lib>=1.0.20')
+depends=('gtk2>=2.18.3' 'gcc-libs>=4.4.2' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.4' 'libxt' 'hunspell>=1.2.8' 'startup-notification>=0.10' 'mime-types' 'dbus-glib>=0.82' 'alsa-lib>=1.0.21.a')
 makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui' 'python' 'wireless_tools')
 optdepends=('libgnomeui' 'python' 'wireless_tools')
 provides=(gecko-sdk)
@@ -22,8 +22,8 @@
         mozilla-ps-pdf-simplify-operators.patch
         nsThreadUtils.patch
         xulrunner-version.patch)
-md5sums=('ca167e69180ab1230aea0763da270a95'
-         'e040029e4c3aecb613342cf559ec1284'
+md5sums=('0b6ccb1e50d96b7127a18a69399fcf05'
+         '7c87142a23e75bbd4d41e0c8de8ab4a6'
          '5efd6772ed0ecf8eddec5d5650191d3c'
          'd806ffcd9fa8d178ebfa9057c1221fbf'
          '63eee2d1da3b43c9d604f2253f242f40'
@@ -55,7 +55,7 @@
 
   unset CFLAGS
   unset CXXFLAGS
-  export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-1.9.1"
+  export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/xulrunner-1.9.1"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
   make -j1 DESTDIR="${pkgdir}" install || return 1

Modified: extra-i686/mozconfig
===================================================================
--- extra-i686/mozconfig	2009-10-30 09:40:43 UTC (rev 56905)
+++ extra-i686/mozconfig	2009-10-30 13:00:15 UTC (rev 56906)
@@ -7,8 +7,6 @@
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-png
-#disabled: mozilla forked their own version of lcms.
-#ac_add_options --enable-system-lcms
 ac_add_options --enable-system-hunspell
 #disabled: mozilla is broken with recent versions of sqlite
 #ac_add_options --enable-system-sqlite