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

Conflicts:
	community/virtualbox/PKGBUILD
	extra/irqbalance/PKGBUILD
	extra/lirc/PKGBUILD
	extra/ruby/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/wine/PKGBUILD

2 files changed, 31 insertions, 48 deletions

diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index b39be4f56..53196d886 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,51 +1,51 @@
-# $Id: PKGBUILD 138761 2011-09-27 20:42:01Z ibiru $
+# $Id: PKGBUILD 142354 2011-11-08 18:38:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=7.0
-_ffoxver=7.0
-pkgrel=1
-pkgver=2.0
-pkgrel=2 # hold ver
+pkgver=8.0
+_ffoxver=8.0
+pkgrel=2
 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')
+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' 'libvpx')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
         mozconfig
         mips.patch
         mozilla-pkgconfig.patch)
-options=('!emptydirs' '!buildflags')
+options=('!emptydirs')
 replaces=('xulrunner-oss')
+md5sums=('9395a5be13da119bd8d53c3225e5d17c'
+         '8dfb78c5bd0581c8cf4753813132bf0b'
+         '639ea80e823543dd415b90c0ee804186')
 
 build() {
-  cd "${srcdir}/icecat-${_ffoxver}/"
-  cp "${srcdir}/mozconfig" .mozconfig
-
-  #fix libdir/sdkdir - fedora
+  cd "$srcdir/mozilla-release"
+  cp "$srcdir/mozconfig" .mozconfig
 
   [[ "$CARCH" == "mips64el" ]] && {
     echo "ac_add_options --disable-ipc" >> .mozconfig
     patch -Np0 -i "${srcdir}/mips.patch"
   }
-  patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
 
-  export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+  #fix libdir/sdkdir - fedora
+  patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
 
 package() {
-  cd "${srcdir}/icecat-${_ffoxver}/"
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
+  cd "$srcdir/mozilla-release"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   # 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
+  install -d $pkgdir/etc/ld.so.conf.d
+  echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
 
-  #wtf mozilla!
   chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
+  sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
 }
diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig
index 96e8a6bd9..82a6ae512 100644
--- a/extra/xulrunner/mozconfig
+++ b/extra/xulrunner/mozconfig
@@ -2,6 +2,8 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+
+# System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
@@ -9,47 +11,28 @@ ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
 ac_add_options --with-system-png
 ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
-ac_add_options --enable-default-toolkit=cairo-gtk2
+# Features
 ac_add_options --enable-safe-browsing
-ac_add_options --enable-extensions=default
 ac_add_options --enable-startup-notification
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-smil
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-shared-js
-ac_add_options --enable-url-classifier
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
+ac_add_options --enable-gio
 
-ac_add_options --disable-javaxpcom
+ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-xprint
 ac_add_options --disable-mochitest
-ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --disable-pedantic
 
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
+# Optimization
+ac_add_options --enable-optimize
 
-export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1