[arch-commits] Commit in xulrunner/trunk (PKGBUILD mozconfig)

[Jan Steffens]

    Date: Tuesday, January 8, 2013 @ 11:59:52
  Author: heftig
Revision: 174912

18.0

Modified:
  xulrunner/trunk/PKGBUILD
  xulrunner/trunk/mozconfig

-----------+
 PKGBUILD  |   16 +++++++++++-----
 mozconfig |   11 +----------
 2 files changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-08 16:33:35 UTC (rev 174911)
+++ PKGBUILD	2013-01-08 16:59:52 UTC (rev 174912)
@@ -2,13 +2,13 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xulrunner
-pkgver=17.0.1
+pkgver=18.0
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
+depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig
@@ -16,8 +16,8 @@
         shared-libs.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('13d616028eb77de927c29b6655c832c9'
-         '4afe63440e2f1935ff90de15db3b70f0'
+md5sums=('485d02563854c20a3788d89db07b0687'
+         'f26710bcf3e65699a0646c47155cb147'
          '27271ce647a83906ef7a24605e840d61'
          '52e52f840a49eb1d14be1c0065b03a93')
 
@@ -29,6 +29,12 @@
   patch -Np1 -i ../mozilla-pkgconfig.patch
   patch -Np1 -i ../shared-libs.patch
 
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
   export PYTHON="/usr/bin/python2"
 

Modified: mozconfig
===================================================================
--- mozconfig	2013-01-08 16:33:35 UTC (rev 174911)
+++ mozconfig	2013-01-08 16:59:52 UTC (rev 174912)
@@ -20,19 +20,10 @@
 ac_add_options --with-pthreads
 
 # Features
-ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
+#ac_add_options --enable-gstreamer
 
-ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
 ac_add_options --disable-tests
-ac_add_options --disable-mochitest
 ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1