main/xulrunner: upgrade to 28.0

ref #2522

9 files changed, 113 insertions, 152 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 41ec53f1b6..dd90c62c16 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -1,9 +1,9 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xulrunner
-pkgver=26.0
+pkgver=28.0
 _ffoxver=$pkgver
-pkgrel=6
+pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -30,7 +30,8 @@ depends_dev="nspr-dev
 	     startup-notification-dev
 	     sqlite-dev
 	     libidl-dev
-	     mesa-dev"
+	     mesa-dev
+	     icu-dev"
 makedepends="$depends_dev
 	     autoconf2.13
 
@@ -46,7 +47,7 @@ install=""
 options=""
 subpackages="$pkgname-dev $pkgname-dbg"
 source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-	mozconfig
+	bug-947981.patch
 	0002-Use-C99-math-isfinite.patch
 	0003-xulrunner-jemalloc-aslr.patch
 	uclibc-malloc_usable_size.patch
@@ -59,10 +60,10 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 	fix-netwerk.patch
 	fix-toolkit.patch
 	fix-tools.patch
-	fix-gfx.patch
 	mozilla-build-arm.patch
 
 	stab.h
+	mozconfig
 	"
 
 # help our shared-object scanner to find the libs
@@ -129,51 +130,51 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="91ce51cc6474f1269484e5327643a59c  firefox-26.0.source.tar.bz2
-4332546696b520412b0dcf2ba8931c06  mozconfig
+md5sums="db06b6da6b826cfc6a49c15bca115a6b  firefox-28.0.source.tar.bz2
+f7a5a5c5f549084deaae9206b2c98eb5  bug-947981.patch
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
-d3d1e831185da3a3e9ddf56c33449c70  uclibc-malloc_usable_size.patch
+f2e5631a1b7a338c2b80b038630647c8  uclibc-malloc_usable_size.patch
 507742325de8687529e4e81e31132ddf  getchar.patch
-84b101ca9b5f91d3387851e1c42d3908  stat.patch
-86b5eb4bb890a45808cc3a46b99cd8a5  moz-libc-filename.patch
+d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
+21b2f7d8718acef5804d620a6f6335c0  moz-libc-filename.patch
 38a9c0d5be155164d50a956ac131d991  fix-ipc.patch
 960d56439a375998ce4e4597bf245375  fix-media.patch
 e1d52fd12bfcf3142028a9ab547cf8d1  fix-netwerk.patch
-c12ed36523df9eadb7e686db06d87511  fix-toolkit.patch
-7d5294021091e861c6a830b2a2044d7a  fix-tools.patch
-d26bf9e63cb3ccfbb3d1f6eac68dc929  fix-gfx.patch
-5fd78a4d942ed6a2302418145954d3cb  mozilla-build-arm.patch
-4383d038b8d8411ea46f4a109197c19e  stab.h"
-sha256sums="31c4fb2792df63ae450e350380a5e18cf1c51487011a9da0b6cc4bffb69d9812  firefox-26.0.source.tar.bz2
-a5ab8c12da5f266458e7f456205a58ea3bedcce717dae9e2087cf59db9598a64  mozconfig
+781dab1d87caffd53c1e103780261f9c  fix-toolkit.patch
+0814ecfd471de2263af3dcb2d0997746  fix-tools.patch
+5fd05dd07c13dd342aac58aec083dcf0  mozilla-build-arm.patch
+4383d038b8d8411ea46f4a109197c19e  stab.h
+4e642df932a46c05c78316402f290eea  mozconfig"
+sha256sums="2ffd0484e7eab52166b851681878a86d54223a6764c756721430fae8e1599628  firefox-28.0.source.tar.bz2
+153c2cc1beb93519562a13ba3c57228bfcfc668f652d2009f1b5c3f9fe974bc2  bug-947981.patch
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
-70d93003a95d3a89bd3193d46a278f094a6b983aa660781e4090d58cf1c488a2  uclibc-malloc_usable_size.patch
+96cfbf558f0d2ef3aba71d32b670b26eb77a0d88fdee4192d3957d2b527d6dce  uclibc-malloc_usable_size.patch
 d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
-bcdfc27fb1561beb797ed8e3d14cb7c88de54a5aed2eb33bf84e331a2b0ec200  stat.patch
-889856baa82413afb2f79b7b3e3add626e1ac181efd398e80c434836b793c294  moz-libc-filename.patch
+a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
+c3ff0cfd53393211d1026cfe1fab02f195a1cd67eac63c25b132c05a157f5391  moz-libc-filename.patch
 059a69ff0dbceeaa5bbb1446aa4233bc578a047fcad22c0efa27dc64bbd72980  fix-ipc.patch
 d582712c28a26679d728d21d2ef8964d119182edaf580a948f57a9e808ccc5cf  fix-media.patch
 0cbb512c4526f0881253a38f1cc79061fba0fe6a0d8b321fb506be190a32e571  fix-netwerk.patch
-7deba648e31c05ff0f85332499dad41d646d1a1850334594bcc523c61d9b5d29  fix-toolkit.patch
-fabc0e5adca3cbd728c1f7dca2b5fd3b0973eff696656842c3564b96e28c7923  fix-tools.patch
-0600b12275516c6062785ddb369f5a7e510f69aaa8ffdf3bbe35df6b516b6941  fix-gfx.patch
-01df910900c8897579f19ddfa8768b41b98fae01672cc81c0eaf13936475c5f0  mozilla-build-arm.patch
-960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h"
-sha512sums="c0933eeb39aa1d5d83d4c85885b87e0b817d945eec4fe8fc1b15256008f14308fbf98d5a83217c112e1ad247133f839f6ad74156eed7b159d32d0fce26532713  firefox-26.0.source.tar.bz2
-4e3a392276d82a1006351a673b853bd6e7a57f4ae9ec5806edd9e7c8d51edcbaeb32111423088231a7e887490b755ec9701508fe58564fe69dda7eee7b147551  mozconfig
+4f42549663dfedf2a1cdc92d64529750b8a7a9deca6ffc8bdfb91d7d33b7d1c5  fix-toolkit.patch
+f8a0e40e1b666eaed6c5e94d7521776463293618d15cfdf04fb05fb08191b414  fix-tools.patch
+9ad22d98018685db9165f712b3f35591f33acdf6db7223782af24f3778302ce7  mozilla-build-arm.patch
+960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
+3dcc3ed71c3c5a7ec01e7a2c8b41c642a0cbcf61f7c9c649d1080dea2f643b17  mozconfig"
+sha512sums="9334b45d8b56829e7061b87c377aae80e48060e127dfc3eb6a6996590dd92268bd0273203094cdf9aa22fda8128ab9ed1e5fd6fee3e93a430359c0a0631090f7  firefox-28.0.source.tar.bz2
+380da7245bff50d366488ef9b738c789db8108d5fc9fbfe2de85a439827db20bb73c3c2da654401837b0eb5e5b119daf06cdd792889d899b7b3a5df3e5ffcb0b  bug-947981.patch
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
-9845400d4a3c5cc4f0c7a80292c555f8192ba5093f59baed86d63c575aa50d73597588a6236948c25619e9dbaad72508abd91edf16374904d0d8345a94755ffc  uclibc-malloc_usable_size.patch
+a74d08b978df2f836b7905fff497304fa189fda22ca070a25b5d4be6e764aa74094a08359dc9a560de835f201dcd5bb610ad4090b4219d0f0f1aade1b4c4e504  uclibc-malloc_usable_size.patch
 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
-478bb56c8e87c5ce6ccf1dd31cfb48be8e1a817e77e3158f633cb48bd269692061f8728589b9cebfac04d484518c2525d61ba4988abe8ea274fdd419ee02ab34  stat.patch
-005d603c4bb90b4ac0d91775cc500416ec218860971a0888316f4d6a92a51f3a67fa30eacbe12c826e589ac0e2ddf3e72eec451382653fd0d557804d4af1e9a6  moz-libc-filename.patch
+1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7  stat.patch
+672560d330c55fbfc3d764264efe214503e6da69ef6f295ddfa4923334abcb57dd43988ec8ac67f370fff1083c9a03d6a57a71fcc0a3811ab1231d6ba25806f5  moz-libc-filename.patch
 3f360d4231355c268fc52e0fedbce5c4f73ad8d60d9424af8641733c0ae181e6226056e605f0d6653b729a9c8e4abe97a9fb2face25938651a7498d5753cea8b  fix-ipc.patch
 58e0e7c1c368530b58aa143be0403d733c4b82cc1a9964c925278e5eff147b2ec2c8c34a6cb217387cb7e9f2ca13c2e299745015edaac510704963282dc68e79  fix-media.patch
 38ebf7ae81d4b6dac0b6840a64f86759fc10e4a7ef26f1ebdc2b7c8d4aab3f95ddcb204a743b307e5dad0cd6c04b278c2311b1ac599e7bb287092c552ed26a51  fix-netwerk.patch
-047f15471c6e906164d92d4476746ff4cd73e097f78e547c1391918e84edf4ac2e986a3f88e0402378e24e1ba6f30ee397ac0ebe0c396ce0e98c8e2489608582  fix-toolkit.patch
-419d896ca3f5d35b82aa5aa161b09c14775ee5b11a5a226ce856c2c8176eeaf4b15bcd0473b6109a7bfb09aca44405cecbb3215402f859c1617758082cff6bc6  fix-tools.patch
-7d47bcfb09f0e59740427e60357d4ceaaaa3a2359031a2c1508890ec3deff97a466a78933caeb0e22e02b2a13ace4a4d9d87c0872dae99d3830550a19dc9a8f3  fix-gfx.patch
-76db19eef8ebcc8886ce7f5d299bbea1682bdc380e0a27e6b0c6ecd9bd9b0a253be60651f91ab7472c1e8d459605b4ed9db42f01a675feb4421ec55995901d0b  mozilla-build-arm.patch
-0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h"
+e9da57c5b33ddde2ad371f66784f193d96cd57da6170f17e0dbdbd62a300645f815ac8e12995457b7a9e76f267c6f9558fc6e744823209df246cc61b53b243a2  fix-toolkit.patch
+7cae3c82c00792011238207a89c76791a03d7fb19460cc465ba3016a1537b901821f5f90bc682cc4413c0a6d626eddbbc7f3dd7878b807d0d490d55760cb7e3b  fix-tools.patch
+be76daca4c53c15524c017d9a76c5892c29e037f73d43af4478c600407553c220ce18e5de3481f6b227fa07b49aa6c83048c5aca9cba534b9589c17d7e78bbd0  mozilla-build-arm.patch
+0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
+518ddaca17202903f5484e832515e45a2579fbe6cc9c0a77322fe00c70d05473d2a46a4d28459881c62b546fd5cefde94d6d7f8821d9244ed1211f4b193b2221  mozconfig"
diff --git a/main/xulrunner/fix-gfx.patch b/main/xulrunner/fix-gfx.patch
deleted file mode 100644
index becdc5b31a..0000000000
--- a/main/xulrunner/fix-gfx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mozilla-release/gfx/layers/BufferUnrotate.cpp.orig
-+++ mozilla-release/gfx/layers/BufferUnrotate.cpp
-@@ -8,6 +8,7 @@
- #include <stdint.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- void BufferUnrotate(uint8_t* aBuffer, int aByteWidth, int aHeight,
-                     int aByteStride, int aXBoundary, int aYBoundary)
diff --git a/main/xulrunner/fix-toolkit.patch b/main/xulrunner/fix-toolkit.patch
index a368205b1c..647aa9f70e 100644
--- a/main/xulrunner/fix-toolkit.patch
+++ b/main/xulrunner/fix-toolkit.patch
@@ -1,5 +1,6 @@
---- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
-+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+diff -ru mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
+--- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-03-15 05:19:36.000000000 +0000
++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc	2014-04-17 10:24:33.793431933 +0000
 @@ -45,6 +45,7 @@
  #include <sys/mman.h>
  #include <sys/stat.h>
@@ -8,8 +9,9 @@
  
  #include <iostream>
  #include <set>
---- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc
-+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
+diff -ru mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
+--- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-03-15 05:19:36.000000000 +0000
++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc	2014-04-17 10:24:33.793431933 +0000
 @@ -41,6 +41,10 @@
  
  #include "common/using_std_string.h"
@@ -21,8 +23,9 @@
  using std::vector;
  
  namespace google_breakpad {
---- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h
-+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
+diff -ru mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
+--- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-03-15 05:19:36.000000000 +0000
++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h	2014-04-17 10:24:33.793431933 +0000
 @@ -53,9 +53,10 @@
  #include <config.h>
  #endif
@@ -35,8 +38,9 @@
  #ifdef HAVE_MACH_O_NLIST_H
  #include <mach-o/nlist.h>
  #endif
---- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
-+++ mozilla-release/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+diff -ru mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h mozilla-release/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
+--- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2014-03-15 05:19:37.000000000 +0000
++++ mozilla-release/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h	2014-04-17 10:24:33.793431933 +0000
 @@ -2813,7 +2813,7 @@
      LSS_INLINE _syscall6(void*, mmap,              void*, s,
                           size_t,                   l, int,               p,
@@ -46,19 +50,21 @@
  
      LSS_INLINE _syscall4(int, newfstatat,         int,   d,
                           const char *,            p,
---- mozilla-release/toolkit.orig/library/Makefile.in
-+++ mozilla-release/toolkit/library/Makefile.in
-@@ -423,7 +423,7 @@
+diff -ru mozilla-release/toolkit.orig/library/Makefile.in mozilla-release/toolkit/library/Makefile.in
+--- mozilla-release/toolkit.orig/library/Makefile.in	2014-03-15 05:19:37.000000000 +0000
++++ mozilla-release/toolkit/library/Makefile.in	2014-04-17 10:24:56.780511957 +0000
+@@ -199,7 +199,7 @@
+ endif
  
  
- ifdef MOZ_CUBEB
 -ifdef MOZ_ALSA
 +ifdef MOZ_ALSA_LIBS
  EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
  endif
- ifdef MOZ_PULSEAUDIO
---- mozilla-release/toolkit.orig/mozapps/update/common/updatedefines.h
-+++ mozilla-release/toolkit/mozapps/update/common/updatedefines.h
+ 
+diff -ru mozilla-release/toolkit.orig/mozapps/update/common/updatedefines.h mozilla-release/toolkit/mozapps/update/common/updatedefines.h
+--- mozilla-release/toolkit.orig/mozapps/update/common/updatedefines.h	2014-03-15 05:19:37.000000000 +0000
++++ mozilla-release/toolkit/mozapps/update/common/updatedefines.h	2014-04-17 10:24:33.793431933 +0000
 @@ -105,7 +105,7 @@
  
  #ifdef SOLARIS
@@ -68,9 +74,10 @@
  # include <fts.h>
  #endif
  # include <dirent.h>
---- mozilla-release/toolkit.orig/mozapps/update/updater/updater.cpp
-+++ mozilla-release/toolkit/mozapps/update/updater/updater.cpp
-@@ -3422,6 +3422,7 @@
+diff -ru mozilla-release/toolkit.orig/mozapps/update/updater/updater.cpp mozilla-release/toolkit/mozapps/update/updater/updater.cpp
+--- mozilla-release/toolkit.orig/mozapps/update/updater/updater.cpp	2014-03-15 05:19:37.000000000 +0000
++++ mozilla-release/toolkit/mozapps/update/updater/updater.cpp	2014-04-17 10:24:33.796765327 +0000
+@@ -3432,6 +3432,7 @@
  int add_dir_entries(const NS_tchar *dirpath, ActionList *list)
  {
    int rv = OK;
@@ -78,7 +85,7 @@
    FTS *ftsdir;
    FTSENT *ftsdirEntry;
    NS_tchar searchpath[MAXPATHLEN];
-@@ -3524,6 +3525,7 @@
+@@ -3534,6 +3535,7 @@
    }
  
    fts_close(ftsdir);
@@ -86,8 +93,9 @@
  
    return rv;
  }
---- mozilla-release.orig/toolkit/xre/nsSigHandlers.cpp	Fri Aug 02 14:36:52 2013 +0000
-+++ mozilla-release/toolkit/xre/nsSigHandlers.cpp	Fri Aug 02 14:42:20 2013 +0000
+diff -ru mozilla-release/toolkit.orig/xre/nsSigHandlers.cpp mozilla-release/toolkit/xre/nsSigHandlers.cpp
+--- mozilla-release/toolkit.orig/xre/nsSigHandlers.cpp	2014-03-15 05:19:38.000000000 +0000
++++ mozilla-release/toolkit/xre/nsSigHandlers.cpp	2014-04-17 10:24:33.796765327 +0000
 @@ -15,6 +15,7 @@
  #include <signal.h>
  #include <stdio.h>
@@ -152,4 +160,4 @@
 +  u_int32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr;
    *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */
    *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */
-#endif
+ #endif
diff --git a/main/xulrunner/fix-tools.patch b/main/xulrunner/fix-tools.patch
index 583ceec3e2..bd468991ec 100644
--- a/main/xulrunner/fix-tools.patch
+++ b/main/xulrunner/fix-tools.patch
@@ -30,14 +30,3 @@
  #ifdef ANDROID
  #include <android/log.h>
  #else
---- mozilla-release/tools.orig/profiler/shared-libraries-linux.cc
-+++ mozilla-release/tools/profiler/shared-libraries-linux.cc
-@@ -14,7 +14,7 @@
- #include "platform.h"
- #include "shared-libraries.h"
- 
--#if !defined(__GLIBC__) && ANDROID_VERSION < 18
-+#if defined(ANDROID) && ANDROID_VERSION < 18
- /* a crapy version of getline, because it's not included in old bionics */
- static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
- {
diff --git a/main/xulrunner/moz-libc-filename.patch b/main/xulrunner/moz-libc-filename.patch
index 3e0e0fc3bf..166d03f3c0 100644
--- a/main/xulrunner/moz-libc-filename.patch
+++ b/main/xulrunner/moz-libc-filename.patch
@@ -1,41 +1,13 @@
---- ./configure.in.orig	2013-06-07 09:49:55.984387546 +0000
-+++ ./configure.in	2013-06-07 10:48:53.749411262 +0000
-@@ -273,6 +273,13 @@
- AC_SUBST(OBJCOPY)
+--- ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig	2014-04-03 13:38:04.304500945 +0000
++++ ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm	2014-04-03 13:41:51.910587459 +0000
+@@ -40,8 +40,8 @@
  
- dnl ========================================================
-+dnl Check the libc filename
-+dnl ========================================================
-+MOZ_LIBC_FILENAME=`$PYTHON -c "from ctypes.util import find_library; print(find_library('c'))"`
-+AC_DEFINE_UNQUOTED(MOZ_LIBC_FILENAME, "$MOZ_LIBC_FILENAME")
-+AC_SUBST(MOZ_LIBC_FILENAME)
-+
-+dnl ========================================================
- dnl Checks for compilers.
- dnl ========================================================
- dnl Set CROSS_COMPILE in the environment when running configure
---- ./toolkit/components/osfile/osfile_unix_allthreads.jsm.orig	2013-06-07 11:06:38.269792499 +0000
-+++ ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm	2013-06-07 11:09:36.714870364 +0000
-@@ -39,7 +39,8 @@
- 
-   // Open libc
-   let libc;
--  let libc_candidates =  [ "libSystem.B.dylib",
-+  let libc_candidates =  [ OS.Constants.Path.libcFilename,
-+                           "libSystem.B.dylib",
-                            "libc.so.6",
-                            "libc.so" ];
-   for (let i = 0; i < libc_candidates.length; ++i) {
---- ./dom/system/OSFileConstants.cpp.orig	2013-06-07 11:48:56.341786916 +0000
-+++ ./dom/system/OSFileConstants.cpp	2013-06-07 11:53:13.181079983 +0000
-@@ -756,6 +753,10 @@
-     return false;
-   }
- 
-+  if (!SetStringProperty(cx, objPath, "libcFilename", NS_LITERAL_STRING(MOZ_LIBC_FILENAME))) {
-+    return false;
-+  }
-+
-   // Configure profileDir only if it is available at this stage
-   if (!gPaths->profileDir.IsVoid()
-     && !SetStringProperty(cx, objPath, "profileDir", gPaths->profileDir)) {
+ // Open libc
+ let libc;
+-let libc_candidates =  [ "libSystem.B.dylib",
+-                         "libc.so.6",
++let libc_candidates =  [ "a.out",
++			 "libSystem.B.dylib",
+                          "libc.so" ];
+ for (let i = 0; i < libc_candidates.length; ++i) {
+   try {
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index 12799059a9..e16cc2b43a 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -34,6 +34,8 @@ ac_add_options --enable-extensions=default
 ac_add_options --disable-elf-hack
 ac_add_options --enable-gio
 ac_add_options --enable-gstreamer
+ac_add_options --with-system-icu
+ac_add_options --disable-pulseaudio
 #uclibc#ac_add_options --enable-jemalloc
 #uclibc#ac_add_options --enable-replace-malloc
 #uclibc#ac_add_options --enable-crashreporter
diff --git a/main/xulrunner/mozilla-build-arm.patch b/main/xulrunner/mozilla-build-arm.patch
index 7801b1573e..742168e31e 100644
--- a/main/xulrunner/mozilla-build-arm.patch
+++ b/main/xulrunner/mozilla-build-arm.patch
@@ -1,25 +1,22 @@
-diff -up mozilla-release/gfx/ycbcr/moz.build.arm mozilla-release/gfx/ycbcr/moz.build
---- mozilla-release/gfx/ycbcr/moz.build.arm	2013-12-05 17:07:32.000000000 +0100
-+++ mozilla-release/gfx/ycbcr/moz.build	2013-12-10 14:47:43.235182479 +0100
-@@ -61,7 +61,7 @@ else:
+--- ./gfx/ycbcr/moz.build.orig	2014-04-03 13:50:38.990296661 +0000
++++ ./gfx/ycbcr/moz.build	2014-04-03 13:52:26.878268547 +0000
+@@ -59,7 +59,7 @@
          'yuv_row_other.cpp',
      ]
  
 -if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
 +if CONFIG['HAVE_ARM_NEON']:
-     ASFILES += [
+     SOURCES += [
          'yuv_row_arm.s',
      ]
-diff -up mozilla-release/media/libtheora/lib/moz.build.arm mozilla-release/media/libtheora/lib/moz.build
---- mozilla-release/media/libtheora/lib/moz.build.arm	2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/libtheora/lib/moz.build	2013-12-12 11:45:41.882119059 +0100
-@@ -8,7 +8,7 @@ MODULE = 'theora'
- 
- LIBRARY_NAME = 'theora'
+--- ./media/libtheora/lib/moz.build.orig	2014-04-03 13:50:38.990296661 +0000
++++ ./media/libtheora/lib/moz.build	2014-04-03 13:53:46.259228947 +0000
+@@ -20,7 +20,7 @@
+     'state.c',
+ ]
  
 -if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
 +if CONFIG['HAVE_ARM_NEON'] and CONFIG['GNU_AS']:
-     asm_suffix = CONFIG['ASM_SUFFIX']
-     ASFILES += [
-         'armbits-gnu.%s' % asm_suffix,
-
+     GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
+         'armbits-gnu',
+         'armfrag-gnu',
diff --git a/main/xulrunner/stat.patch b/main/xulrunner/stat.patch
index 9ee6937d1b..ed7dc007e2 100644
--- a/main/xulrunner/stat.patch
+++ b/main/xulrunner/stat.patch
@@ -12,14 +12,14 @@
    PROP_END
  };
  
---- ./toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2013-04-16 19:24:04.196535897 +0000
-+++ ./toolkit/components/osfile/modules/osfile_unix_back.jsm	2013-04-17 06:49:08.869379007 +0000
-@@ -502,7 +502,7 @@
-                       /*path*/   Types.fd,
-                       /*buf*/    Types.stat.out_ptr
+--- ./toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2014-04-03 13:08:26.686409787 +0000
++++ ./toolkit/components/osfile/modules/osfile_unix_back.jsm	2014-04-03 13:34:14.101716259 +0000
+@@ -512,7 +512,7 @@
+                       /*path*/   Type.fd,
+                       /*buf*/    Type.stat.out_ptr
                       );
--       } else if (OS.Constants.libc._STAT_VER != undefined) {
-+       } else if (OS.Constants.libc.OSFILE_STAT_MACROS != undefined) {
-          const ver = OS.Constants.libc._STAT_VER;
-          // Linux, all widths
-          let xstat =
+-       } else if (Const._STAT_VER != undefined) {
++       } else if (Const.OSFILE_STAT_MACROS != undefined) {
+          const ver = Const._STAT_VER;
+          let xstat_name, lxstat_name, fxstat_name;
+          if (OS.Constants.Sys.Name == "SunOS") {
diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch
index b4a009317b..f9e726d55b 100644
--- a/main/xulrunner/uclibc-malloc_usable_size.patch
+++ b/main/xulrunner/uclibc-malloc_usable_size.patch
@@ -1,19 +1,21 @@
---- mozilla-release-old/memory/mozalloc/Makefile.in
-+++ mozilla-release/memory/mozalloc/Makefile.in
-@@ -43,6 +43,10 @@
- 
- include $(DEPTH)/config/autoconf.mk
+diff -ru mozilla-release.orig/memory/mozalloc/Makefile.in mozilla-release/memory/mozalloc/Makefile.in
+--- mozilla-release.orig/memory/mozalloc/Makefile.in	2014-03-15 05:19:31.000000000 +0000
++++ mozilla-release/memory/mozalloc/Makefile.in	2014-04-17 12:57:18.819942458 +0000
+@@ -3,6 +3,10 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
 +ifdef MOZ_MEMORY
 +SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) $(call EXPAND_LIBNAME_PATH,memory,../build)
 +endif
 +
- VISIBILITY_FLAGS=
  STL_FLAGS	=
  ifdef _MSC_VER
---- ./memory/mozalloc/mozalloc.cpp.orig	2013-02-15 21:15:06.000000000 +0000
-+++ ./memory/mozalloc/mozalloc.cpp	2013-02-20 08:00:26.328809270 +0000
-@@ -30,7 +30,7 @@
+ STL_FLAGS	= -D_HAS_EXCEPTIONS=0
+diff -ru mozilla-release.orig/memory/mozalloc/mozalloc.cpp mozilla-release/memory/mozalloc/mozalloc.cpp
+--- mozilla-release.orig/memory/mozalloc/mozalloc.cpp	2014-03-15 05:19:31.000000000 +0000
++++ mozilla-release/memory/mozalloc/mozalloc.cpp	2014-04-17 12:55:15.007704929 +0000
+@@ -28,7 +28,7 @@
  #include "mozilla/mozalloc_oom.h"  // for mozalloc_handle_oom
  
  /* Windows doesn't have malloc_usable_size, but jemalloc has */