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

[Jan Steffens]

    Date: Tuesday, January 8, 2013 @ 05:07:21
  Author: heftig
Revision: 174872

18.0

Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/mozconfig

-----------+
 PKGBUILD  |   18 ++++++++++++------
 mozconfig |    8 ++------
 2 files changed, 14 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-08 10:07:02 UTC (rev 174871)
+++ PKGBUILD	2013-01-08 10:07:21 UTC (rev 174872)
@@ -3,24 +3,24 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=17.0.1
+pkgver=18.0
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib'
          'libnotify' 'desktop-file-utils' 'hicolor-icon-theme'
-         'libvpx' 'libevent' 'nss>=3.13.3' 'hunspell' 'sqlite')
-makedepends=('unzip' 'zip' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa'
+         'libvpx' 'libevent' 'nss>=3.14.1' 'hunspell' 'sqlite')
+makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa'
              'autoconf2.13' 'libidl2' 'xorg-server-xvfb' 'imake')
-optdepends=('wireless_tools: Location detection via available WiFi networks')
+optdepends=('networkmanager: Location detection via available WiFi networks')
 url="http://www.mozilla.org/projects/firefox"
 install=firefox.install
 options=(!emptydirs)
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
         mozconfig firefox.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
-md5sums=('13d616028eb77de927c29b6655c832c9'
-         '5644c7b42f51013e2023787938fa955e'
+md5sums=('485d02563854c20a3788d89db07b0687'
+         'efdd58626b2f56dea31e26879eb2db3b'
          '6174396b4788deffa399db3f6f010a94'
          '150ac0fb3ac7b2114c8e8851a9e0516c'
          '0d053487907de4376d67d8f499c5502b'
@@ -37,6 +37,12 @@
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
     browser/base/Makefile.in
 
+  # 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/firefox"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"

Modified: mozconfig
===================================================================
--- mozconfig	2013-01-08 10:07:02 UTC (rev 174871)
+++ mozconfig	2013-01-08 10:07:21 UTC (rev 174872)
@@ -3,6 +3,8 @@
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
 
+ac_add_options --enable-official-branding
+
 # System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -20,12 +22,9 @@
 ac_add_options --with-pthreads
 
 # Features
-ac_add_options --enable-official-branding
 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
@@ -33,6 +32,3 @@
 
 # PGO
 mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1