aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/xulrunner/APKBUILD18
-rw-r--r--main/xulrunner/ns_min.patch11
2 files changed, 22 insertions, 7 deletions
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 7655deb6a2..ba470e9474 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=19.0.2
+pkgver=20.0.1
_ffoxver=$pkgver
pkgrel=0
pkgdesc="runtime environment for xul-based applications"
@@ -54,6 +54,7 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
cairo.patch
getchar.patch
sysconf.patch
+ ns_min.patch
"
# help our shared-object scanner to find the libs
ldpath="/usr/lib/xulrunner-$pkgver"
@@ -114,27 +115,30 @@ dev() {
mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
}
-md5sums="de09d603c3b768a1698d90141f3b2644 firefox-19.0.2.source.tar.bz2
+md5sums="b822ff4b2348410587dec563235d9320 firefox-20.0.1.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"
-sha256sums="f6850dbdaf63a67a184b3b23267619750981f291834fe8c04df9cea826a57d71 firefox-19.0.2.source.tar.bz2
+090ea4daeedfff2915da62a738c7e81d sysconf.patch
+73605938f0609256ce922ee44d86bb3b ns_min.patch"
+sha256sums="03fe28c82d6577e9af8659f2ee44d5f05950353732d47a0ade562855ba564cf4 firefox-20.0.1.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"
-sha512sums="5f8ede3eee699aa4598a51896b6bc23508aace100a10b5e9dd298f78c3bda3f8d8f89940c1be9b7bea319e18c11a7e871e3e4a6f5aebbea55cb6505633bc5898 firefox-19.0.2.source.tar.bz2
+15fa203c6a253b9e0229ff5bd0d1c88a4ab4ee2aef34ae88fdf7fe06ba7962f8 sysconf.patch
+5a615e72ef529319c2ee0a90549b0c8cfbce065b2963b8495ad007e326dd6d0f ns_min.patch"
+sha512sums="07b280de2f48ae994e74945011da45d4737a9e17b4d4377725f6968598d992e6dd6c6929690815bf4bb554499a3e4fe17bfef652c3d762caa2e8af100a5d0359 firefox-20.0.1.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"
+b47db40d6b54fa3bdb650d680e1468dc16f323c3cf48e4f867373bcdfde82d2dbb85910262503285ba3bde8a5757d74a17c1ae6db31116bc8a42e05ab2bb20d6 sysconf.patch
+c54a0353163b61aceb1e8706d2d2786c22560a015c17ab9c5374ba564dda83985a491c2ae997448d0c9a7401400796f919adf932fa82ff2570101e2fb5607df5 ns_min.patch"
diff --git a/main/xulrunner/ns_min.patch b/main/xulrunner/ns_min.patch
new file mode 100644
index 0000000000..8599ab8feb
--- /dev/null
+++ b/main/xulrunner/ns_min.patch
@@ -0,0 +1,11 @@
+--- ./xpcom/io/nsMultiplexInputStream.cpp.orig 2013-04-16 09:33:36.246386974 +0000
++++ ./xpcom/io/nsMultiplexInputStream.cpp 2013-04-16 09:34:21.240133225 +0000
+@@ -529,7 +529,7 @@
+ 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));
+
+ rv = stream->Seek(NS_SEEK_END, -newPos);
+ NS_ENSURE_SUCCESS(rv, rv);