testing/firefox: upgrade to 33.0 and remove xulrunner

19 files changed, 167 insertions, 450 deletions

diff --git a/testing/firefox/0002-Use-C99-math-isfinite.patch b/testing/firefox/0002-Use-C99-math-isfinite.patch
new file mode 100644
index 0000000000..ba4f5cfb3d
--- /dev/null
+++ b/testing/firefox/0002-Use-C99-math-isfinite.patch
@@ -0,0 +1,17 @@
+--- ./xpcom/ds/nsMathUtils.h.orig
++++ ./xpcom/ds/nsMathUtils.h
+@@ -104,12 +104,12 @@
+ #ifdef WIN32
+   // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
+   return !!_finite(aNum);
+-#elif defined(XP_DARWIN)
++#elif defined(XP_DARWIN) || defined(_GLIBCXX_CMATH)
+   // Darwin has deprecated |finite| and recommends |isfinite|. The former is
+   // not present in the iOS SDK.
+   return std::isfinite(aNum);
+ #else
+-  return finite(aNum);
++  return isfinite(aNum);
+ #endif
+ }
+ 
diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index c313b3c955..86f3d77862 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -1,65 +1,80 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=firefox
-pkgver=32.0.3
+pkgver=33.0
 _pkgver=$pkgver
 _xulver=$pkgver
 pkgrel=0
-pkgdesc="firefox web browser"
+pkgdesc="Firefox web browser"
 url="http://www.firefox.com"
 arch="all"
 license="GPL LGPL MPL"
-depends="xulrunner>=${_xulver}"
-makedepends="xulrunner-dev>=${_xulver}
-
-	     nspr-dev
-	     nss-dev
-	     gtk+-dev
-             mesa-dev
-             icu-dev
-             dbus-glib-dev
-             alsa-lib-dev
-             libvorbis-dev
-             libogg-dev
-             libtheora-dev
-             wireless-tools-dev
-             libnotify-dev
-             libevent-dev
-	     libvpx-dev
-             libxt-dev
-             libjpeg-turbo-dev
-             bzip2-dev
-             hunspell-dev
-             startup-notification-dev
-             sqlite-dev
-             libidl-dev
-             gstreamer1-dev
-             gst-plugins-base1-dev
-
-	     autoconf2.13
-
-             sed
-	     python
-	     zip
-	     yasm
-
-	     autoconf
-	     automake
-	     libtool
-
-	     paxctl"
+depends=""
+depends_dev="
+	alsa-lib-dev
+	bzip2-dev
+	dbus-glib-dev
+	gst-plugins-base1-dev
+	gstreamer1-dev
+	gtk+2.0-dev
+	hunspell-dev
+	icu-dev
+	libevent-dev
+	libidl-dev
+	libjpeg-turbo-dev
+	libnotify-dev
+	libogg-dev
+	libtheora-dev
+	libvorbis-dev
+	libvpx-dev
+	libxt-dev
+	libxcomposite-dev
+	mesa-dev
+	nspr-dev
+	nss-dev
+	sqlite-dev
+	startup-notification-dev
+	wireless-tools-dev
+	"
+makedepends="$depends_dev
+	autoconf
+	automake
+	libtool
+	paxctl
+	python
+	sed
+	yasm
+	zip
+	"
+
 install=""
-subpackages="$pkgname-pdfjs $pkgname-dbg"
+subpackages="$pkgname-dbg $pkgname-dev"
 source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
 	mozconfig
-	duckduckgo.patch
 	vendor.js
+
+	0002-Use-C99-math-isfinite.patch
+	fix-arm-atomics-grsec.patch
+	fix-ipc.patch
+	fix-media-webrtc.patch
+	fix-media.patch
+	fix-netwerk.patch
+	fix-toolkit.patch
+	fix-tools.patch
+	getchar.patch
+	mozilla-build-arm.patch
+	stat.patch
+	stab.h
+
 	firefox.desktop
 	firefox-safe.desktop"
 
 _builddir="${srcdir}/mozilla-release"
 _mozappdir=/usr/lib/firefox-$pkgver
 
+# help our shared-object scanner to find the libs
+ldpath="$_mozappdir"
+
 prepare() {
 	local i
 
@@ -70,15 +85,15 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
 
 	cp "${srcdir}/mozconfig" .mozconfig
-	sed -e "s/#${CLIBC}#//g" -i .mozconfig
 
-	echo "ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)" >> .mozconfig
-	if [ -n "$DEBUG" ]; then
-		echo "ac_add_options --enable-debug-symbols" >> .mozconfig
-		echo "ac_add_options --disable-install-strip" >>.mozconfig
-	fi
+	# use our default cflags
+	echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> .mozconfig
+#	echo "ac_add_options --build=$CBUILD" >> .mozconfig
+#	echo "ac_add_options --host=$CHOST" >> .mozconfig
+
 }
 
 build() {
@@ -88,14 +103,18 @@ build() {
 	export CFLAGS="$(echo $CFLAGS | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')"
 	export CXXFLAGS="$CFLAGS"
 
-#	export LDFLAGS="-Wl,-rpath,${_mozappdir}"
-	make -j1 -f client.mk build \
+	make -f client.mk build \
 		STRIP="/bin/true" \
-		MOZ_MAKE_FLAGS="$MAKEOPTS" || return 1
+		|| return 1
 }
 
 package() {
 	cd "$_builddir"
+
+	# only used for startupcache creation.
+	local paxflags="-msp"
+	paxctl -c $paxflags */dist/bin/xpcshell || return 1
+
 	make -j1 -f client.mk install \
 		DESTDIR="$pkgdir" \
 		MOZ_MAKE_FLAGS="$MAKEOPTS" \
@@ -132,31 +151,64 @@ __EOF__
 	chmod 755 "$pkgdir"/usr/bin/firefox
 
 	# install our vendor prefs
+	install -d "$pkgdir"/$_mozappdir/browser/defaults/preferences
 	cat "$srcdir"/vendor.js >> "$pkgdir"/$_mozappdir/browser/defaults/preferences/firefox-branding.js
 }
 
-pdfjs() {
-	pkgdesc="Firefox PDF Reader in JavaScript"
-	mkdir -p "$subpkgdir"/$_mozappdir/browser/chrome
-	mv "$pkgdir"/$_mozappdir/browser/chrome/pdfjs \
-		"$subpkgdir"/$_mozappdir/browser/chrome/
+dev() {
+	mkdir -p "$subpkgdir"/usr/lib/
+	mv "$pkgdir"/usr/lib/firefox-devel* "$subpkgdir"/usr/lib/ || return 1
+	default_dev
 }
 
-md5sums="618bf992a5cb80f8879435262bdfcee0  firefox-32.0.3.source.tar.bz2
-11e6b4bb7593d79fe8827952a3e73c74  mozconfig
-6b8d481d8fba55fa0ad4f26c02164da8  duckduckgo.patch
+md5sums="b0e793898bddf4f2bc46e42a331f3383  firefox-33.0.source.tar.bz2
+3419b00f4787fdb78a1b4b20cecb4f9e  mozconfig
 1515663477ce427cbdc42f04d8d5ca4e  vendor.js
+6ab77b80c8c7d6fd07ab53c54561f4df  0002-Use-C99-math-isfinite.patch
+b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
+38a9c0d5be155164d50a956ac131d991  fix-ipc.patch
+ce4839160acf3986a2118326ed2b8444  fix-media-webrtc.patch
+f8bc97333847f37597c0bac0dca64eb2  fix-media.patch
+170b8e7f8cab21f0965f226c291a57f9  fix-netwerk.patch
+296954be4c6d6bfcc24d0a46a2bd7d74  fix-toolkit.patch
+2279c55a85013fc1c0d01427768edd4d  fix-tools.patch
+507742325de8687529e4e81e31132ddf  getchar.patch
+308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
+d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
+4383d038b8d8411ea46f4a109197c19e  stab.h
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
-sha256sums="ae2aa20538d03b392a04663593fb106c0aec2d8bbb78ddac84a88ce7617b1efe  firefox-32.0.3.source.tar.bz2
-dca72a9f140bbc37ec7a9bd81ee886f6730b5866fce4e6ca1ebd48ee4df52c42  mozconfig
-db057fd5448c3e4d40459fb8ee178296cc723e19efadb1e02a85a4e22a6e560a  duckduckgo.patch
+sha256sums="1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229  firefox-33.0.source.tar.bz2
+2131b4888a1837d211c02afcbd8dacb91795fe66080c4c467a98961087b24deb  mozconfig
 d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46  vendor.js
+080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e  0002-Use-C99-math-isfinite.patch
+ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomics-grsec.patch
+059a69ff0dbceeaa5bbb1446aa4233bc578a047fcad22c0efa27dc64bbd72980  fix-ipc.patch
+3e53af8beff122bcf5790c148fb51f41f44b6fe5dd5799777b70c3542c32cb93  fix-media-webrtc.patch
+c1d0fbcf5e8610df9adc66ea956753e7d495e8ed2d1c1e06d183f4680c85db97  fix-media.patch
+4a2f8ff5e9b1359541eba8854098cee2caeb40ad9dbdc4b8fcf48b47ea8ca2d2  fix-netwerk.patch
+666883189dba3f4c7ba6b5bc85026c85bcb84477c2d5ba00d6414ddd0f744368  fix-toolkit.patch
+60ed0870119480994c6c455034c52dd21b8482b7617c3a0032e3b2abf4467e4d  fix-tools.patch
+d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
+6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
+a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
+960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
 b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda  firefox.desktop
 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3  firefox-safe.desktop"
-sha512sums="4cc4beb2bc00e38c61dea2878e75bdd28accbb0850d50146ae8e70e4c6d062f2985a23a6c4b84cd0ca552659a2b77843c3de93229708bc996cbb11d3b6497943  firefox-32.0.3.source.tar.bz2
-869b7eb925ccc055ecc3b6fddfa4419b5d2b650d627e551564f76788ed157e1c0a6a42e52e92f65d330957d4839954590ca6f6cf6f26a54a8490bdef18047180  mozconfig
-a7d6a0420f70374a2fa6a74a18ab15c77451f45dc9226ec251f5635a970dbd45ed6cf571ae5ab81b8126951667fc61b1fc5dfb7b8a4d7cc6d465d39e842dc985  duckduckgo.patch
+sha512sums="856585bedb0c0cc2a5c8591a5a3d373dca66fd8c15dd2c04b09e17e9a2da2bf978e4bff872a814b42e1963c3a6def05ccc0b68d9a8f4e7c9152dca878cf17e51  firefox-33.0.source.tar.bz2
+ba25f4d16fb896edfdb7af882db562654bfc5c3f5f547abf224696836dc4e513b2da22dd35039dc967b441a1ff918e75c54b861d05e9fcb3f58463813c53306b  mozconfig
 93570f821e59af4d233fc4b1df85e1d145a5e041ad402fd72921987a5a2f5218538d7a13d59bbf0bda5e7df1d5281407674a3765625936340106d1185b15b5d8  vendor.js
+7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
+4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
+3f360d4231355c268fc52e0fedbce5c4f73ad8d60d9424af8641733c0ae181e6226056e605f0d6653b729a9c8e4abe97a9fb2face25938651a7498d5753cea8b  fix-ipc.patch
+a5d00272fc9e2b3a786f5891bac11b04ffaf6dfcbd2b30cba42286b79d12fefb6cb9c81e6d75987ab3ee19d12af20a074c77edc655bd470be06f5025eb38e609  fix-media-webrtc.patch
+f4d1b0814247cdfe1655a0f345def4f80bd66f37ae5b0edc2cd6b8358e39e9a1bcc0a4ed7d1c4074a1302fb027a2f8be549225c5f4f56caf2513c968ed05d666  fix-media.patch
+8a896ee4d1465a844351cec84217de1a28b9f27bfc1e34cc71368664b5b8804bd66bdcadc78c78ee365abd1d0cafed1e6c568045c93cb78ac94e2818f503d58c  fix-netwerk.patch
+72459754016f254c58d56d9a8719897fa8da9cf969eaa498e1e755457942d3f0ac56e4abd3f6a66ef924c94aa034d0af18a1fb653926b2496f0c2615fdb24c5e  fix-toolkit.patch
+426b57ce698de3eecd1b52f2998974c4e0b5922584b09b554d436c61fee039d1f86345e746fee067801ebbf50815c4d19b96266a2ed72a35ae5c3edbdb57bba1  fix-tools.patch
+18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
+e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
+1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7  stat.patch
+0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/testing/firefox/duckduckgo.patch b/testing/firefox/duckduckgo.patch
deleted file mode 100644
index 8de4e4b270..0000000000
--- a/testing/firefox/duckduckgo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties.duckduckgo	2012-10-24 16:32:26.000000000 +0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-07 16:27:04.278857840 +0100
-@@ -9,6 +9,7 @@ browser.search.defaultenginename=Google
- browser.search.order.1=Google
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
-+browser.search.order.4=DuckDuckGo
- 
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
-diff -up mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml
---- mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml.duckduckgo	2012-11-07 16:27:04.278857840 +0100
-+++ mozilla-release/browser/locales/en-US/searchplugins/duckduckgo.xml	2012-11-07 16:27:04.278857840 +0100
-@@ -0,0 +1,11 @@
-+<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
-+    <ShortName>DuckDuckGo</ShortName>
-+    <Description>We believe you can get better search and privacy at the same time.</Description>
-+    <InputEncoding>UTF-8</InputEncoding>
-+    <Image height="16" width="16" type="image/x-icon">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</Image>
-+    <Url type="text/html" method="GET" template="https://duckduckgo.com/">
-+        <Param name="q" value="{searchTerms}"/>
-+        <Param name="t" value="alpine"/>
-+    </Url>
-+    <SearchForm>https://duckduckgo.com/</SearchForm>
-+</SearchPlugin>
-diff -up mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo mozilla-release/browser/locales/en-US/searchplugins/list.txt
---- mozilla-release/browser/locales/en-US/searchplugins/list.txt.duckduckgo	2012-10-24 16:32:26.000000000 +0200
-+++ mozilla-release/browser/locales/en-US/searchplugins/list.txt	2012-11-07 16:27:04.279857842 +0100
-@@ -1,5 +1,6 @@
- amazondotcom
- bing
-+duckduckgo
- eBay
- google
- twitter
diff --git a/testing/xulrunner/fix-arm-atomics-grsec.patch b/testing/firefox/fix-arm-atomics-grsec.patch
index 5524b2aa73..5524b2aa73 100644
--- a/testing/xulrunner/fix-arm-atomics-grsec.patch
+++ b/testing/firefox/fix-arm-atomics-grsec.patch
diff --git a/testing/xulrunner/fix-ipc.patch b/testing/firefox/fix-ipc.patch
index e21d57f40d..e21d57f40d 100644
--- a/testing/xulrunner/fix-ipc.patch
+++ b/testing/firefox/fix-ipc.patch
diff --git a/testing/xulrunner/fix-media-webrtc.patch b/testing/firefox/fix-media-webrtc.patch
index a173d795dd..a173d795dd 100644
--- a/testing/xulrunner/fix-media-webrtc.patch
+++ b/testing/firefox/fix-media-webrtc.patch
diff --git a/testing/xulrunner/fix-media.patch b/testing/firefox/fix-media.patch
index af6045fe72..af6045fe72 100644
--- a/testing/xulrunner/fix-media.patch
+++ b/testing/firefox/fix-media.patch
diff --git a/testing/xulrunner/fix-netwerk.patch b/testing/firefox/fix-netwerk.patch
index a31b286229..a31b286229 100644
--- a/testing/xulrunner/fix-netwerk.patch
+++ b/testing/firefox/fix-netwerk.patch
diff --git a/testing/xulrunner/fix-toolkit.patch b/testing/firefox/fix-toolkit.patch
index 0303223652..0303223652 100644
--- a/testing/xulrunner/fix-toolkit.patch
+++ b/testing/firefox/fix-toolkit.patch
diff --git a/testing/xulrunner/fix-tools.patch b/testing/firefox/fix-tools.patch
index b0a6d4fbcc..b0a6d4fbcc 100644
--- a/testing/xulrunner/fix-tools.patch
+++ b/testing/firefox/fix-tools.patch
diff --git a/testing/xulrunner/getchar.patch b/testing/firefox/getchar.patch
index 981206b971..981206b971 100644
--- a/testing/xulrunner/getchar.patch
+++ b/testing/firefox/getchar.patch
diff --git a/testing/firefox/mozconfig b/testing/firefox/mozconfig
index 1bc3311193..a46b0f71c3 100644
--- a/testing/firefox/mozconfig
+++ b/testing/firefox/mozconfig
@@ -2,45 +2,46 @@
 
 ac_add_options --prefix=/usr
 ac_add_options --libdir=/usr/lib
+
+ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
+ac_add_options --with-system-icu
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
+ac_add_options --with-system-pixman
 ac_add_options --with-system-png
-ac_add_options --with-system-libvpx
-ac_add_options --with-pthreads
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --disable-installer
-ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-xprint
-ac_add_options --disable-strip
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
+ac_add_options --with-system-zlib
+
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
+
+# make the -dbg package more meaningful with symbols
+# ac_add_options --enable-debug-symbols=-g
+ac_add_options --disable-install-strip
+
+ac_add_options --enable-gstreamer=1.0
+ac_add_options --enable-official-branding
 ac_add_options --enable-startup-notification
-ac_add_options --enable-libxul
-ac_add_options --with-system-libxul
+
+ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-chrome-format=jar
 ac_add_options --disable-elf-hack
-ac_add_options --enable-libnotify
-ac_add_options --disable-cpp-exceptions
-ac_add_options --enable-url-classifier
-ac_add_options --enable-gio
-ac_add_options --enable-gstreamer=1.0
 ac_add_options --disable-gnomevfs
-ac_add_options --disable-static
-ac_add_options --enable-official-branding
-ac_add_options --with-system-icu
+ac_add_options --disable-installer
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-jemalloc
+ac_add_options --disable-mochitest
 ac_add_options --disable-pulseaudio
-#uclibc#ac_add_options --enable-jemalloc
-#uclibc#ac_add_options --enable-replace-malloc
-#musl#ac_add_options --disable-jemalloc
+ac_add_options --disable-static
+ac_add_options --disable-strip
+ac_add_options --disable-tests
+ac_add_options --disable-updater
+ac_add_options --disable-xprint
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/testing/xulrunner/mozilla-build-arm.patch b/testing/firefox/mozilla-build-arm.patch
index dcf2f6d8a4..dcf2f6d8a4 100644
--- a/testing/xulrunner/mozilla-build-arm.patch
+++ b/testing/firefox/mozilla-build-arm.patch
diff --git a/testing/xulrunner/stab.h b/testing/firefox/stab.h
index 6f70af3989..6f70af3989 100644
--- a/testing/xulrunner/stab.h
+++ b/testing/firefox/stab.h
diff --git a/testing/xulrunner/stat.patch b/testing/firefox/stat.patch
index ed7dc007e2..ed7dc007e2 100644
--- a/testing/xulrunner/stat.patch
+++ b/testing/firefox/stat.patch
diff --git a/testing/xulrunner/0002-Use-C99-math-isfinite.patch b/testing/xulrunner/0002-Use-C99-math-isfinite.patch
deleted file mode 100644
index 03f830bcae..0000000000
--- a/testing/xulrunner/0002-Use-C99-math-isfinite.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From cdb9db4c1c593dbe22db4f389a62fce034f31f2d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Nov 2011 08:30:51 +0000
-Subject: [PATCH 2/4] Use C99 math isfinite
-
----
- xpcom/ds/nsMathUtils.h   |    6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/xpcom/ds/nsMathUtils.h b/xpcom/ds/nsMathUtils.h
-index 21ffbec..2e80476 100644
---- a/xpcom/ds/nsMathUtils.h
-+++ b/xpcom/ds/nsMathUtils.h
-@@ -131,7 +131,11 @@ inline NS_HIDDEN_(bool) NS_finite(double d)
-     // NOTE: '!!' casts an int to bool without spamming MSVC warning C4800.
-     return !!_finite(d);
- #else
--    return finite(d);
-+#ifdef _GLIBCXX_CMATH
-+    return std::isfinite(d);
-+#else
-+    return isfinite(d);
-+#endif
- #endif
- }
- 
--- 
-1.7.7.4
-
diff --git a/testing/xulrunner/0003-xulrunner-jemalloc-aslr.patch b/testing/xulrunner/0003-xulrunner-jemalloc-aslr.patch
deleted file mode 100644
index 7aa00009f0..0000000000
--- a/testing/xulrunner/0003-xulrunner-jemalloc-aslr.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 88bb9f90ec1e4b43fb78596c8ff7577c92592eb4 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Fri, 25 Nov 2011 08:36:52 +0000
-Subject: [PATCH 3/4] xulrunner: jemalloc aslr
-
----
- memory/jemalloc/jemalloc.c |   33 ++++++++++++++++++++++-----------
- 1 files changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
-index ad7c450..91de92c 100644
---- a/memory/mozjemalloc/jemalloc.c
-+++ b/memory/mozjemalloc/jemalloc.c
-@@ -410,7 +410,7 @@ void *_mmap(void *addr, size_t length, int prot, int flags,
- static const bool __isthreaded = true;
- #endif
- 
--#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
-+#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
- #define JEMALLOC_USES_MAP_ALIGN	 /* Required on Solaris 10. Might improve performance elsewhere. */
- #endif
- 
-@@ -2181,20 +2181,31 @@ pages_map_align(size_t size, int pfd, size_t alignment)
- 	 * We don't use MAP_FIXED here, because it can cause the *replacement*
- 	 * of existing mappings, and we only want to create new mappings.
- 	 */
--#ifdef MALLOC_PAGEFILE
--	if (pfd != -1) {
--		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
--		    MAP_NOSYNC | MAP_ALIGN, pfd, 0);
--	} else
--#endif
--	       {
--		ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
--		    MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
--	}
-+	ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-+		    MAP_NOSYNC| MAP_ANON, -1, 0);
- 	assert(ret != NULL);
- 
- 	if (ret == MAP_FAILED)
- 		ret = NULL;
-+	else {
-+		uintptr_t aligned_ret;
-+		size_t extra_size;
-+
-+		aligned_ret = (uintptr_t)ret + alignment - 1;
-+		aligned_ret &= ~(alignment - 1);
-+		extra_size = aligned_ret - (uintptr_t)ret;
-+		munmap(ret, extra_size);
-+		munmap(ret + extra_size + size, alignment - extra_size);
-+		ret = (void *)aligned_ret;
-+#ifdef MALLOC_PAGEFILE
-+		if (pfd != -1) {
-+			ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-+			    MAP_NOSYNC | MAP_FIXED, pfd, 0);
-+		}
-+		if (ret == MAP_FAILED)
-+			ret = NULL;
-+#endif
-+	}
- 	return (ret);
- }
- #endif
--- 
-1.7.7.4
-
diff --git a/testing/xulrunner/APKBUILD b/testing/xulrunner/APKBUILD
deleted file mode 100644
index a5782891ce..0000000000
--- a/testing/xulrunner/APKBUILD
+++ /dev/null
@@ -1,175 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=xulrunner
-pkgver=32.0.3
-_ffoxver=$pkgver
-pkgrel=0
-pkgdesc="runtime environment for xul-based applications"
-url="http://developer.mozilla.org/en/XULRunner"
-arch="all"
-license="GPL LGPL MPL"
-depends=
-depends_dev="nspr-dev
-	     nss-dev
-	     gtk+-dev
-	     dbus-glib-dev
-	     alsa-lib-dev
-	     gstreamer1-dev
-	     gst-plugins-base1-dev
-	     libvorbis-dev
-	     libogg-dev
-	     libtheora-dev
-	     wireless-tools-dev
-	     libnotify-dev
-	     libevent-dev
-	     libvpx-dev
-	     libxt-dev
-	     libjpeg-turbo-dev
-	     bzip2-dev
-	     hunspell-dev
-	     startup-notification-dev
-	     sqlite-dev
-	     libidl-dev
-	     mesa-dev
-	     icu-dev"
-makedepends="$depends_dev
-	     autoconf2.13
-
-             sed
-	     python
-	     zip
-	     yasm
-	     paxctl
-
-	     autoconf
-	     automake
-	     libtool"
-install=""
-options=""
-subpackages="$pkgname-dev $pkgname-dbg"
-source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-	0002-Use-C99-math-isfinite.patch
-	0003-xulrunner-jemalloc-aslr.patch
-	getchar.patch
-	stat.patch
-	fix-arm-atomics-grsec.patch
-
-	fix-ipc.patch
-	fix-media.patch
-	fix-media-webrtc.patch
-	fix-netwerk.patch
-	fix-toolkit.patch
-	fix-tools.patch
-	mozilla-build-arm.patch
-
-	stab.h
-	mozconfig
-	"
-
-# help our shared-object scanner to find the libs
-ldpath="/usr/lib/xulrunner-$pkgver"
-
-_builddir="${srcdir}/mozilla-release"
-prepare() {
-	local i
-
-	cd "$_builddir"
-
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-
-	cp "${srcdir}/mozconfig" .mozconfig || return 1
-	sed -e "s/#${CLIBC}#//g" -i .mozconfig
-
-	cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
-}
-
-build() {
-	cd "$_builddir"
-
-	# mozilla's buildsystem is on drugs, so we just kill our CFLAGS and hope
-	# for the best. --nenolod
-	unset CFLAGS
-	unset CXXFLAGS
-
-	make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	# only used for startupcache creation.
-	local paxflags="-m"
-	[ "$CARCH" = "x86" ] && paxflags="-msp"
-	paxctl -c $paxflags */dist/bin/xpcshell || return 1
-
-	make -j1 DESTDIR="$pkgdir" -f client.mk install || return 1
-
-	# make install does not install xpt.py but its needed by firefox
-	mkdir -p "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin
-	cp xpcom/typelib/xpt/tools/xpt.py \
-		"$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/
-
-	msg "Setting up compatibility symlinks..."
-	ln -sf /usr/lib/xulrunner-${pkgver}/libxul.so "${pkgdir}"/usr/lib/libxul.so
-	ln -sf /usr/lib/xulrunner-${pkgver}/libmozalloc.so "${pkgdir}"/usr/lib/libmozalloc.so
-}
-
-dev() {
-	replaces="xulrunner"
-	depends="xulrunner"
-
-	mkdir -p "${subpkgdir}"/usr/lib
-	mv "${pkgdir}"/usr/lib/xulrunner-devel-${pkgver} "${subpkgdir}"/usr/lib
-	mv "${pkgdir}"/usr/lib/pkgconfig "${subpkgdir}"/usr/lib
-	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
-}
-
-md5sums="618bf992a5cb80f8879435262bdfcee0  firefox-32.0.3.source.tar.bz2
-f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
-e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
-507742325de8687529e4e81e31132ddf  getchar.patch
-d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
-b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
-38a9c0d5be155164d50a956ac131d991  fix-ipc.patch
-f8bc97333847f37597c0bac0dca64eb2  fix-media.patch
-ce4839160acf3986a2118326ed2b8444  fix-media-webrtc.patch
-170b8e7f8cab21f0965f226c291a57f9  fix-netwerk.patch
-296954be4c6d6bfcc24d0a46a2bd7d74  fix-toolkit.patch
-2279c55a85013fc1c0d01427768edd4d  fix-tools.patch
-308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
-4383d038b8d8411ea46f4a109197c19e  stab.h
-7701fb5564182cced00b2b45bce39685  mozconfig"
-sha256sums="ae2aa20538d03b392a04663593fb106c0aec2d8bbb78ddac84a88ce7617b1efe  firefox-32.0.3.source.tar.bz2
-2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
-324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
-d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
-a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
-ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomics-grsec.patch
-059a69ff0dbceeaa5bbb1446aa4233bc578a047fcad22c0efa27dc64bbd72980  fix-ipc.patch
-c1d0fbcf5e8610df9adc66ea956753e7d495e8ed2d1c1e06d183f4680c85db97  fix-media.patch
-3e53af8beff122bcf5790c148fb51f41f44b6fe5dd5799777b70c3542c32cb93  fix-media-webrtc.patch
-4a2f8ff5e9b1359541eba8854098cee2caeb40ad9dbdc4b8fcf48b47ea8ca2d2  fix-netwerk.patch
-666883189dba3f4c7ba6b5bc85026c85bcb84477c2d5ba00d6414ddd0f744368  fix-toolkit.patch
-60ed0870119480994c6c455034c52dd21b8482b7617c3a0032e3b2abf4467e4d  fix-tools.patch
-6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
-960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
-bfc5a101a6a50490dc865b4b7cae94be5e4fad9ecd6b5bcccdd8380eeb1d1a71  mozconfig"
-sha512sums="4cc4beb2bc00e38c61dea2878e75bdd28accbb0850d50146ae8e70e4c6d062f2985a23a6c4b84cd0ca552659a2b77843c3de93229708bc996cbb11d3b6497943  firefox-32.0.3.source.tar.bz2
-9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
-46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
-18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
-1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7  stat.patch
-4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
-3f360d4231355c268fc52e0fedbce5c4f73ad8d60d9424af8641733c0ae181e6226056e605f0d6653b729a9c8e4abe97a9fb2face25938651a7498d5753cea8b  fix-ipc.patch
-f4d1b0814247cdfe1655a0f345def4f80bd66f37ae5b0edc2cd6b8358e39e9a1bcc0a4ed7d1c4074a1302fb027a2f8be549225c5f4f56caf2513c968ed05d666  fix-media.patch
-a5d00272fc9e2b3a786f5891bac11b04ffaf6dfcbd2b30cba42286b79d12fefb6cb9c81e6d75987ab3ee19d12af20a074c77edc655bd470be06f5025eb38e609  fix-media-webrtc.patch
-8a896ee4d1465a844351cec84217de1a28b9f27bfc1e34cc71368664b5b8804bd66bdcadc78c78ee365abd1d0cafed1e6c568045c93cb78ac94e2818f503d58c  fix-netwerk.patch
-72459754016f254c58d56d9a8719897fa8da9cf969eaa498e1e755457942d3f0ac56e4abd3f6a66ef924c94aa034d0af18a1fb653926b2496f0c2615fdb24c5e  fix-toolkit.patch
-426b57ce698de3eecd1b52f2998974c4e0b5922584b09b554d436c61fee039d1f86345e746fee067801ebbf50815c4d19b96266a2ed72a35ae5c3edbdb57bba1  fix-tools.patch
-e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
-0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
-0cb16f394a3946a2bb31ef0084d8bbdc8e0e897d67c9224251d73fded07ab2fb193fcd8e5dd03109a3572a2455c44350b658cc64e2f981d047f45c8ade3afcf8  mozconfig"
diff --git a/testing/xulrunner/mozconfig b/testing/xulrunner/mozconfig
deleted file mode 100644
index 24d10221da..0000000000
--- a/testing/xulrunner/mozconfig
+++ /dev/null
@@ -1,46 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-pixman
-ac_add_options --with-system-png
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --with-pthreads
-ac_add_options --enable-strip
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-extensions=default
-ac_add_options --disable-elf-hack
-ac_add_options --enable-gio
-ac_add_options --enable-gstreamer=1.0
-ac_add_options --with-system-icu
-ac_add_options --disable-pulseaudio
-ac_add_options --disable-jemalloc
-ac_add_options --disable-crashreporter
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1