From f8db5d1487e8e0ceeb97a396e357c1540a047ed8 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 28 Sep 2011 23:14:32 +0000
Subject: Wed Sep 28 23:14:32 UTC 2011

---
 extra/xulrunner/PKGBUILD  | 25 ++++++++-----------------
 extra/xulrunner/mozconfig |  1 -
 2 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'extra/xulrunner')

diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 8180b8fec..da74448ea 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD 136643 2011-08-31 10:33:15Z ibiru $
+# $Id: PKGBUILD 138761 2011-09-27 20:42:01Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=6.0.1
-_ffoxver=6.0.1
+pkgver=7.0
+_ffoxver=7.0
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'gconf')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}.source.tar.bz2
         mozconfig
-        mozilla-pkgconfig.patch
-        moz-639554.patch)
+        mozilla-pkgconfig.patch)
 options=('!emptydirs' '!buildflags')
 replaces=('xulrunner-oss')
-md5sums=('43b71655e1307c7f62896339e70c9aed'
-         '2358a2ddd35bcdd62ff42442dfe548d9'
-         '639ea80e823543dd415b90c0ee804186'
-         '96d3c1790a56f8e6df88e327adccf3bf')
+md5sums=('673a015a23e3fefa18d80db68c8b9fc1'
+         '108a53313284908cc3afe5e29a7557e9'
+         '639ea80e823543dd415b90c0ee804186')
 
 build() {
   cd "${srcdir}/mozilla-release"
@@ -28,8 +26,6 @@ build() {
 
   #fix libdir/sdkdir - fedora
   patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
-  #upstream fixes
-  patch -Np1 -i "${srcdir}/moz-639554.patch"
 
   export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
 
@@ -40,11 +36,6 @@ package() {
   cd "${srcdir}/mozilla-release"
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
-  #Remove included dictionaries, add symlink to system myspell path.
-  #Note: this will cause file conflicts when users have installed dictionaries in the old location
-  rm -rf "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries"
-  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-$pkgver/dictionaries"
-
   # add xulrunner library path to ld.so.conf
   install -d ${pkgdir}/etc/ld.so.conf.d
   echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig
index 03a352920..96e8a6bd9 100644
--- a/extra/xulrunner/mozconfig
+++ b/extra/xulrunner/mozconfig
@@ -47,7 +47,6 @@ ac_add_options --disable-pedantic
 
 ac_add_options --enable-gio
 ac_add_options --disable-gnomevfs
-ac_add_options --enable-gconf
 ac_add_options --enable-libnotify
 
 export BUILD_OFFICIAL=1
-- 
cgit v1.2.3-54-g00ecf