From 6a84bbf53b8ef742c8ecd7263d3ee10369b2f887 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 16 Oct 2014 04:34:13 +0200
Subject: [PATCH] firefox: update to 33.0; use our cflags and use system icu.

---
 srcpkgs/firefox/template | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 48918e7a34b..6299c75ed5d 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -1,6 +1,6 @@
 # Template build file for 'firefox'.
 pkgname=firefox
-version=32.0.3
+version=33.0
 revision=1
 wrksrc=mozilla-release
 short_desc="Lightweight gecko-based web browser"
@@ -8,16 +8,17 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="https://www.mozilla.org/firefox/"
 license="MPL-1.1, GPL-2, LGPL-2.1"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
-checksum=ae2aa20538d03b392a04663593fb106c0aec2d8bbb78ddac84a88ce7617b1efe
+checksum=1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229
 
 lib32disabled=yes
 
-hostmakedepends="which unzip zip pkg-config perl python yasm"
-makedepends="nss-devel>=3.16 libjpeg-turbo-devel libpng-devel>=1.6
- pixman-devel sqlite-devel gst-plugins-base1-devel gtk+-devel
+hostmakedepends="unzip zip pkg-config perl python yasm"
+makedepends="nss-devel>=3.17 libjpeg-turbo-devel libpng-devel>=1.6
+ icu-devel>=54 pixman-devel sqlite-devel gst-plugins-base1-devel gtk+-devel
  libevent-devel libnotify-devel libvpx-devel>1.3.0 libXrender-devel
  startup-notification-devel dbus-glib-devel alsa-lib-devel pulseaudio-devel
- hunspell-devel>=1.3.2 libSM-devel libXScrnSaver-devel libXt-devel"
+ hunspell-devel>=1.3.2 libXcomposite-devel libSM-devel libXScrnSaver-devel
+ libXt-devel"
 depends="nss>=3.17 desktop-file-utils hicolor-icon-theme"
 
 if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
@@ -59,15 +60,17 @@ do_configure() {
 		--enable-skia --disable-debug --disable-gnomevfs --disable-gconf \
 		--disable-crashreporter --disable-updater --disable-tests \
 		--disable-mochitest --disable-installer --disable-elf-hack \
-		--enable-pulseaudio --enable-gstreamer=1.0 \
+		--with-system-icu --enable-pulseaudio --enable-gstreamer=1.0 \
 		--with-nspr-prefix=${XBPS_CROSS_BASE}/usr \
 		--with-nss-prefix=${XBPS_CROSS_BASE}/usr ${cross_args} \
-		--with-google-api-keyfile="${wrksrc}/google-api-key"
+		--with-google-api-keyfile="${wrksrc}/google-api-key" \
+		--enable-optimize="$CFLAGS" --disable-strip --disable-install-strip \
+		--disable-static
 }
 
 do_build() {
 	cd xbps-build
-	SHELL=/bin/bash make ${makejobs} MOZ_MAKE_FLAGS="${makejobs}"
+	SHELL=/bin/bash make ${makejobs}
 }
 
 do_install() {