From b46442c26ea0b3c83569cb32f8fcd7cd16ccb9ac Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 14 May 2013 22:25:44 +0200
Subject: [PATCH] firefox: make this build again and enable/disable some
 options.

---
 srcpkgs/firefox/files/mozconfig | 18 +++++++++++-------
 srcpkgs/firefox/template        | 10 +++++-----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/firefox/files/mozconfig b/srcpkgs/firefox/files/mozconfig
index bf559b0f62f..a20bef544c5 100644
--- a/srcpkgs/firefox/files/mozconfig
+++ b/srcpkgs/firefox/files/mozconfig
@@ -12,25 +12,29 @@ 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-pixman
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-ac_add_options --disable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-official-branding
-ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
 
+# Features
+ac_add_options --with-pthreads
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-skia
+
+ac_add_options --disable-system-cairo
 ac_add_options --disable-gnomevfs
+ac_add_options --disable-gconf
 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
+ac_add_options --disable-elf-hack
+ac_add_options --disable-debug
 
 # Optimization
 ac_add_options --enable-optimize
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 99f954c8e11..afd9e10008e 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -12,10 +12,10 @@ checksum=3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c
 
 hostmakedepends="unzip zip pkg-config perl python yasm"
 makedepends="libjpeg-turbo-devel libpng-devel>=1.6
- pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel
- gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel
- startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel
- wireless_tools-devel libXScrnSaver-devel libXt-devel"
+ pixman-devel libIDL-devel nss-devel>=3.14.3_3 sqlite-devel
+ gtk+-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel
+ startup-notification-devel dbus-glib-devel alsa-lib-devel
+ hunspell-devel libXScrnSaver-devel libXt-devel"
 
 do_build() {
 	# Fix PRE_RELEASE_SUFFIX
@@ -23,7 +23,7 @@ do_build() {
 	cp -f ${FILESDIR}/mozconfig .mozconfig
 	export LDFLAGS="-Wl,-R/usr/lib/firefox"
 
-	make ${makejobs} -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
+	SHELL=/bin/bash make ${makejobs} -f client.mk MOZ_MAKE_FLAGS="${makejobs}"
 }
 
 do_install() {