main/xulrunner: upgrade to 21.0

4 files changed, 20 insertions, 20 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index ee85d1d8d..9a5fa7e52 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=20.0.1
+pkgver=21.0
 _ffoxver=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -116,36 +116,36 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="b822ff4b2348410587dec563235d9320  firefox-20.0.1.source.tar.bz2
+md5sums="6e2510e9466b280c367de0e4c05a8840  firefox-21.0.source.tar.bz2
 faf16153ed2cf1e5b163fed9168cb34f  mozconfig
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
 d3d1e831185da3a3e9ddf56c33449c70  uclibc-malloc_usable_size.patch
 6a3942d96c7ce3c63251761cc12c8349  cairo.patch
-a7b33d8b75306f225e3a8d1a8a403736  getchar.patch
-090ea4daeedfff2915da62a738c7e81d  sysconf.patch
-73605938f0609256ce922ee44d86bb3b  ns_min.patch
+507742325de8687529e4e81e31132ddf  getchar.patch
+760c05f196bb6f152d7f895742e6aa02  sysconf.patch
+1555e753821d7dd1a731a33fcb1f741b  ns_min.patch
 623cd16618c57f037ab4132dfe8694b0  stat.patch
 692099e5c2da4dffb56d979d5dabe545  alpine-libc.patch"
-sha256sums="03fe28c82d6577e9af8659f2ee44d5f05950353732d47a0ade562855ba564cf4  firefox-20.0.1.source.tar.bz2
+sha256sums="3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c  firefox-21.0.source.tar.bz2
 ccb0e3841188952b6f9a3e1766b31eec49534080e656ade029be97df6a8c9674  mozconfig
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
 70d93003a95d3a89bd3193d46a278f094a6b983aa660781e4090d58cf1c488a2  uclibc-malloc_usable_size.patch
 519be436124cf9716d3df732e633f5d73c5c9da79bb48447e1d9724baf9b430f  cairo.patch
-f30846e4b4c86dc1f7308e5e2a76951f51e2932d70b08ed8fe3129c53bb527d3  getchar.patch
-15fa203c6a253b9e0229ff5bd0d1c88a4ab4ee2aef34ae88fdf7fe06ba7962f8  sysconf.patch
-5a615e72ef529319c2ee0a90549b0c8cfbce065b2963b8495ad007e326dd6d0f  ns_min.patch
+d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
+2dacfceeb78d352321a62c950eb50837307c57720719ea6424681c3f5b0ed1fd  sysconf.patch
+6fc6f05dd45826ce550902ce4c8feb11abacae94ede413628c37ff03a285f859  ns_min.patch
 41d55a1d807c84e624da8c258410e8689559d108a4dc56118c6c4755dee514df  stat.patch
 04333975eeb771c8ffd0db5d7fb7117fb2b508b06db72e9fa9f42e9ccf3bc606  alpine-libc.patch"
-sha512sums="07b280de2f48ae994e74945011da45d4737a9e17b4d4377725f6968598d992e6dd6c6929690815bf4bb554499a3e4fe17bfef652c3d762caa2e8af100a5d0359  firefox-20.0.1.source.tar.bz2
+sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab69261e98b503ae6b5b47deac8ebbb982649729e3ed4d9e646f13073e0822  firefox-21.0.source.tar.bz2
 914e0dfc9a531f6fbff07a9e250e1146371cbffb5eed7fffaa2c5643f8e7759d62d314b3c2dbc5cf9031b66001bbf05892c9ae5aa2b9e77ffe704837a2938f12  mozconfig
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
 9845400d4a3c5cc4f0c7a80292c555f8192ba5093f59baed86d63c575aa50d73597588a6236948c25619e9dbaad72508abd91edf16374904d0d8345a94755ffc  uclibc-malloc_usable_size.patch
 66c6cb290153e4333ffda0407230a7801149864a69eac6adc130653e7cff28b1fbfd9f20cf0cfd4ee35ae3eb8b2dc6357a48024a8e7005218b44d58efbdcf483  cairo.patch
-a4692b9a8b5239523486cf10bf0debd54e8d2da6f994775a3e46dc6da71591b7ed698ceea30cd9f4bb30ca1e9b93b3eb18b8055bba5c5f6171e019a5b5cc29f8  getchar.patch
-b47db40d6b54fa3bdb650d680e1468dc16f323c3cf48e4f867373bcdfde82d2dbb85910262503285ba3bde8a5757d74a17c1ae6db31116bc8a42e05ab2bb20d6  sysconf.patch
-c54a0353163b61aceb1e8706d2d2786c22560a015c17ab9c5374ba564dda83985a491c2ae997448d0c9a7401400796f919adf932fa82ff2570101e2fb5607df5  ns_min.patch
+18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
+0e8d21cd0cec34d7825e59f05669010f9f4bcfb94ca1f5788495cdbd25e9c845d4ca8fa028e599f3464bc4d7827a833708d4513c5082ffbcb5be423318048077  sysconf.patch
+0020796ab970a3e6a207e5a5b93251cc075d749dc642175fd811c7af0618b722a7f7d80d00318edc205cac21d14f8fc0487cdb623a558c5f52e936ae873ce4bc  ns_min.patch
 e975bc5a0f77e29a2afb848cd0c164f9c0edabf0d96472d6b23e2b08fa2bbe3b51ee63c16c986e7fc9bc243c666b23c37d0b939cbf4c258b9dce5c3ee77d6f55  stat.patch
 f36b40a969bae6791be1c26aeeb235be66bb3b8fbf41322cabf0395e4050b72c189cf15ed56ba854b98c62169386e15052fef7f4c4f195a39c72b3f3a979a4bc  alpine-libc.patch"
diff --git a/main/xulrunner/getchar.patch b/main/xulrunner/getchar.patch
index f50db879c..981206b97 100644
--- a/main/xulrunner/getchar.patch
+++ b/main/xulrunner/getchar.patch
@@ -1,5 +1,5 @@
---- ./media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig
-+++ ./media/webrtc/trunk/src/system_wrappers/source/spreadsortlib/spreadsort.hpp
+--- ./media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig
++++ ./media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
 @@ -21,6 +21,11 @@
  #include "constants.hpp"

  #include <cstring>

diff --git a/main/xulrunner/ns_min.patch b/main/xulrunner/ns_min.patch
index 8599ab8fe..826a18bfb 100644
--- a/main/xulrunner/ns_min.patch
+++ b/main/xulrunner/ns_min.patch
@@ -4,8 +4,8 @@
                      rv = stream->Tell(&avail);
                      NS_ENSURE_SUCCESS(rv, rv);
  
--                    int64_t newPos = streamPos + NS_MIN(avail, std::abs(remaining));
-+                    int64_t newPos = streamPos + NS_MIN(avail, (int64_t)std::abs(remaining));
+-                    int64_t newPos = streamPos + XPCOM_MIN(avail, std::abs(remaining));
++                    int64_t newPos = streamPos + XPCOM_MIN(avail, (int64_t)std::abs(remaining));
  
                      rv = stream->Seek(NS_SEEK_END, -newPos);
                      NS_ENSURE_SUCCESS(rv, rv);
diff --git a/main/xulrunner/sysconf.patch b/main/xulrunner/sysconf.patch
index b715f2173..dfec4ee28 100644
--- a/main/xulrunner/sysconf.patch
+++ b/main/xulrunner/sysconf.patch
@@ -1,5 +1,5 @@
---- ./media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc.orig
-+++ ./media/webrtc/trunk/src/system_wrappers/source/cpu_info.cc
+--- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc
++++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc
 @@ -21,6 +21,7 @@
  // Not implemented yet, might be possible to use Linux implementation
  #else // defined(WEBRTC_LINUX)