main/xulrunner: upgrade to 19.0

4 files changed, 17 insertions, 61 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index d8fc7253f..d6c9bd03c 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xulrunner
-pkgver=18.0.2
+pkgver=19.0
 _ffoxver=$pkgver
 pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
@@ -56,7 +56,6 @@ source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}
 	cairo.patch
 	getchar.patch
 	sysconf.patch
-	mallctl.patch
 	"
 # help our shared-object scanner to find the libs
 ldpath="/usr/lib/xulrunner-$pkgver"
@@ -117,30 +116,27 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="a7a20f52a3ffdd8d2fafa8a1a1db49c7  firefox-18.0.2.source.tar.bz2
-300ee7803d9426dc3c91e08830e73e23  mozconfig
+md5sums="3dc732b6ce177792b43324f4bc7164d8  firefox-19.0.source.tar.bz2
+8fb048f27e87abc9fd45b80135f5c784  mozconfig
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
-998b48fe73dc642065ab25230d739b2c  uclibc-malloc_usable_size.patch
+d3d1e831185da3a3e9ddf56c33449c70  uclibc-malloc_usable_size.patch
 6a3942d96c7ce3c63251761cc12c8349  cairo.patch
 a7b33d8b75306f225e3a8d1a8a403736  getchar.patch
-090ea4daeedfff2915da62a738c7e81d  sysconf.patch
-2a8cb2d3065f4475ea463f8498ea2324  mallctl.patch"
-sha256sums="6aa2cd33903d612cf569e2824a6168feb6209f09fb3ca730ec10236da49bd236  firefox-18.0.2.source.tar.bz2
-a880ba2a36168b095ddd856a6f57b84c29f59647f708107aa3ef00738f060ce3  mozconfig
+090ea4daeedfff2915da62a738c7e81d  sysconf.patch"
+sha256sums="645eaba5ee9a2728799822f6f79d91bfd4c3dade5141db2e0a606c85eec589f4  firefox-19.0.source.tar.bz2
+36c59e9086aeef16935c82f1c806c799cdcc64a80b48b90813489ba2fb434fb3  mozconfig
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
-40236401426f4aa7dc0b8ab46b9132f4453507fb61de7e393782258bf89e9e74  uclibc-malloc_usable_size.patch
+70d93003a95d3a89bd3193d46a278f094a6b983aa660781e4090d58cf1c488a2  uclibc-malloc_usable_size.patch
 519be436124cf9716d3df732e633f5d73c5c9da79bb48447e1d9724baf9b430f  cairo.patch
 f30846e4b4c86dc1f7308e5e2a76951f51e2932d70b08ed8fe3129c53bb527d3  getchar.patch
-15fa203c6a253b9e0229ff5bd0d1c88a4ab4ee2aef34ae88fdf7fe06ba7962f8  sysconf.patch
-0634e9586d82b827af2164cd8bff86981a6d430e2eccb8c0e0089ded64c480bc  mallctl.patch"
-sha512sums="c9be9d7328fe614059f895879351a48a3083f4a7ac1eb22eab3af8e94c432ad06d4f8a7295c2b843c4a289e463fcbd2dc389c8bc8018c5d8c666929a82214e54  firefox-18.0.2.source.tar.bz2
-2dc845b0c50d280ab41d7eed7bad57751122e87680eef0d68478ebf0dfdbf12d3ddf9c2167e87d9145fd1e6fac61431c8c79a2153b11c512b79b92a186a79e95  mozconfig
+15fa203c6a253b9e0229ff5bd0d1c88a4ab4ee2aef34ae88fdf7fe06ba7962f8  sysconf.patch"
+sha512sums="6b9f93dd5cdb5a5a02072cf6dd43952c78f379f530963e630551904e746c15e343527b1095f327a7d3af05df7007fdf88fc1cd618bf07d93abbf5aabbb82a727  firefox-19.0.source.tar.bz2
+6323d129f6f5edd5de0ca60a9092bf2d9ec7443b5353ca2cf89db757fbfbf9cf5c475b6f6fc00d5b9024071e37a4f8614fdb212773b3af3c32e12b256fef6378  mozconfig
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
-0aa589cf43dac499f13e027240c83f221acf97e6369e78edab55ff78317f60288cbf42a2bdd1cb6167a70f781d4ca8ae2f7493b94efb5a93bbfeab3ea278c27d  uclibc-malloc_usable_size.patch
+9845400d4a3c5cc4f0c7a80292c555f8192ba5093f59baed86d63c575aa50d73597588a6236948c25619e9dbaad72508abd91edf16374904d0d8345a94755ffc  uclibc-malloc_usable_size.patch
 66c6cb290153e4333ffda0407230a7801149864a69eac6adc130653e7cff28b1fbfd9f20cf0cfd4ee35ae3eb8b2dc6357a48024a8e7005218b44d58efbdcf483  cairo.patch
 a4692b9a8b5239523486cf10bf0debd54e8d2da6f994775a3e46dc6da71591b7ed698ceea30cd9f4bb30ca1e9b93b3eb18b8055bba5c5f6171e019a5b5cc29f8  getchar.patch
-b47db40d6b54fa3bdb650d680e1468dc16f323c3cf48e4f867373bcdfde82d2dbb85910262503285ba3bde8a5757d74a17c1ae6db31116bc8a42e05ab2bb20d6  sysconf.patch
-9626a29fcb26de9254628f6904d66f333a3a2fb848b6a6abc545c1a411c82e0e6637e8a62308e95dd825dde40fc10c55be6751cf800d7595e3eb03739e6d44f1  mallctl.patch"
+b47db40d6b54fa3bdb650d680e1468dc16f323c3cf48e4f867373bcdfde82d2dbb85910262503285ba3bde8a5757d74a17c1ae6db31116bc8a42e05ab2bb20d6  sysconf.patch"
diff --git a/main/xulrunner/mallctl.patch b/main/xulrunner/mallctl.patch
deleted file mode 100644
index 7c56f584e..000000000
--- a/main/xulrunner/mallctl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=815681
-
-diff --git a/xpcom/base/AvailableMemoryTracker.cpp b/xpcom/base/AvailableMemoryTracker.cpp
-index 69af67d..ef98fec 100644
---- a/xpcom/base/AvailableMemoryTracker.cpp
-+++ b/xpcom/base/AvailableMemoryTracker.cpp
-@@ -26,9 +26,7 @@
- #   include <windows.h>
- #endif
- 
--#if defined(MOZ_MEMORY)
- #   include "jemalloc.h"
--#endif  // MOZ_MEMORY
- 
- using namespace mozilla;
- 
-@@ -498,11 +496,7 @@ nsJemallocFreeDirtyPagesRunnable::Run()
- {
-   MOZ_ASSERT(NS_IsMainThread());
- 
--#if defined(MOZ_JEMALLOC)
--  mallctl("arenas.purge", nullptr, 0, nullptr, 0);
--#elif defined(MOZ_MEMORY)
-   jemalloc_free_dirty_pages();
--#endif
- 
-   return NS_OK;
- }
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index a6141fa60..416d42115 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -32,6 +32,7 @@ ac_add_options --enable-safe-browsing
 ac_add_options --enable-startup-notification
 ac_add_options --enable-extensions=default
 ac_add_options --enable-jemalloc
+ac_add_options --enable-replace-malloc 
 ac_add_options --disable-elf-hack
 ac_add_options --enable-gio
 ac_add_options --enable-gstreamer
diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch
index 49b5a6430..b4a009317 100644
--- a/main/xulrunner/uclibc-malloc_usable_size.patch
+++ b/main/xulrunner/uclibc-malloc_usable_size.patch
@@ -11,9 +11,9 @@
  VISIBILITY_FLAGS=
  STL_FLAGS	=
  ifdef _MSC_VER
---- ./memory/mozalloc/mozalloc.cpp.orig
-+++ ./memory/mozalloc/mozalloc.cpp
-@@ -33,7 +33,7 @@
+--- ./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 @@
  #include "mozilla/mozalloc_oom.h"  // for mozalloc_handle_oom
  
  /* Windows doesn't have malloc_usable_size, but jemalloc has */
@@ -22,16 +22,3 @@
  extern "C" size_t malloc_usable_size(const void *ptr);
  #endif
  
-@@ -213,10 +213,10 @@
- 
- #if defined(XP_MACOSX)
-     return malloc_size(ptr);
--#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) || defined(__FreeBSD__)
-+#elif defined(MOZ_MEMORY) || (defined(XP_LINUX) && !defined(ANDROID)) && !defined(__UCLIBC__) || defined(__FreeBSD__)
-     // Android bionic libc doesn't have malloc_usable_size.
-     return malloc_usable_size(ptr);
--#elif defined(XP_WIN)
-+#elif defined(XP_WIN) || defined(__UCLIBC__)
-     return _msize(ptr);
- #else
-     return 0;