Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/conkeror-git/PKGBUILD
	community/spidermonkey/PKGBUILD
	core/gcc/PKGBUILD
	extra/file-roller/PKGBUILD
	extra/pixman/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/xulrunner/PKGBUILD
	extra/xulrunner/xulrunner-omnijar.patch
	kde-unstable/akonadi/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	testing/mesa/PKGBUILD

1 files changed, 14 insertions, 25 deletions

diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index bb5a20c32..783b9f3e3 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,52 +1,38 @@
-# $Id: PKGBUILD 128075 2011-06-21 17:45:36Z ibiru $
+# $Id: PKGBUILD 131156 2011-07-11 11:19:22Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=2.0.1
-_ffoxver=4.0.1
-pkgrel=3
+pkgver=5.0
+_ffoxver=5.0
+pkgrel=1
 pkgver=2.0
 pkgrel=2 # hold ver
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64' 'mips64el')
 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')
+makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa' 'gconf')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
         mozconfig
         mozilla-pkgconfig.patch
-        xulrunner-version.patch
-        xulrunner-omnijar.patch
-        port_gnomevfs_to_gio.patch
         mips.patch)
-options=('!emptydirs')
+options=('!emptydirs' '!buildflags')
 replaces=('xulrunner-oss')
 build() {
   cd "${srcdir}/icecat-${_ffoxver}/"
-   cp "${srcdir}/mozconfig" .mozconfig
+  cp "${srcdir}/mozconfig" .mozconfig
 
   #fix libdir/sdkdir - fedora
    patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
 
-  #Force installation to the same path for every version
-   patch -Np1 -i "${srcdir}/xulrunner-version.patch"
-
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=620931
-   patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
-
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=494163
-   patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
-
   [[ "$CARCH" == "mips64el" ]] && {
     echo "ac_add_options --disable-ipc" >> .mozconfig
     patch -Np0 -i "${srcdir}/mips.patch"
   }
 
-  unset CFLAGS
-  unset CXXFLAGS
-
   export CXXFLAGS="-fpermissive"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
@@ -57,10 +43,13 @@ package() {
 
   #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-2.0/dictionaries"
-  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-2.0/dictionaries"
+  rm -rf "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries"
+  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/xulrunner-5.0/dictionaries"
 
   # add xulrunner library path to ld.so.conf
   install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/xulrunner-2.0" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
+  echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
 }
+md5sums=('9f64a01e86a5d424e12a8e3305c5debe'
+         '2358a2ddd35bcdd62ff42442dfe548d9'
+         '639ea80e823543dd415b90c0ee804186')