main/xulrunner: upgrade to 23.0

4 files changed, 47 insertions, 23 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 25e1f417b..c5210bf13 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=21.0
+pkgver=23.0
 _ffoxver=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -53,10 +53,12 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 	cairo.patch
 	getchar.patch
 	sysconf.patch
-	ns_min.patch
 	stat.patch
 	moz-libc-filename.patch
+	mozilla-831688.patch
+	no-stab.patch
 	"
+
 # help our shared-object scanner to find the libs
 ldpath="/usr/lib/xulrunner-$pkgver"
 
@@ -116,7 +118,7 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="6e2510e9466b280c367de0e4c05a8840  firefox-21.0.source.tar.bz2
+md5sums="794e0139c4df0392146353c655d94bb9  firefox-23.0.source.tar.bz2
 faf16153ed2cf1e5b163fed9168cb34f  mozconfig
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
@@ -124,10 +126,11 @@ d3d1e831185da3a3e9ddf56c33449c70  uclibc-malloc_usable_size.patch
 6a3942d96c7ce3c63251761cc12c8349  cairo.patch
 507742325de8687529e4e81e31132ddf  getchar.patch
 760c05f196bb6f152d7f895742e6aa02  sysconf.patch
-1555e753821d7dd1a731a33fcb1f741b  ns_min.patch
 623cd16618c57f037ab4132dfe8694b0  stat.patch
-10600ca1b36ff177bf4e301056553cf4  moz-libc-filename.patch"
-sha256sums="3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c  firefox-21.0.source.tar.bz2
+10600ca1b36ff177bf4e301056553cf4  moz-libc-filename.patch
+01f1e791aba776c36c41922c97e74d02  mozilla-831688.patch
+cb9c8a02dfff2421e8380eb0b2954eb6  no-stab.patch"
+sha256sums="2d64bd12cfa80c57e4a7f4156c7b4fde725a6173dfe48e2fac12e1927faf563e  firefox-23.0.source.tar.bz2
 ccb0e3841188952b6f9a3e1766b31eec49534080e656ade029be97df6a8c9674  mozconfig
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
@@ -135,10 +138,11 @@ ccb0e3841188952b6f9a3e1766b31eec49534080e656ade029be97df6a8c9674  mozconfig
 519be436124cf9716d3df732e633f5d73c5c9da79bb48447e1d9724baf9b430f  cairo.patch
 d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
 2dacfceeb78d352321a62c950eb50837307c57720719ea6424681c3f5b0ed1fd  sysconf.patch
-6fc6f05dd45826ce550902ce4c8feb11abacae94ede413628c37ff03a285f859  ns_min.patch
 41d55a1d807c84e624da8c258410e8689559d108a4dc56118c6c4755dee514df  stat.patch
-b2f72d12a2df3bc84d2582d70ec9fc26099bc87c26c303ec5c08ac2e26fe35db  moz-libc-filename.patch"
-sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab69261e98b503ae6b5b47deac8ebbb982649729e3ed4d9e646f13073e0822  firefox-21.0.source.tar.bz2
+b2f72d12a2df3bc84d2582d70ec9fc26099bc87c26c303ec5c08ac2e26fe35db  moz-libc-filename.patch
+bada0870d4ce77fd955bd8b451b8eb38dd4c614dc3619887db86d040e6ad5bb9  mozilla-831688.patch
+d51a7708188e59b59fa5df4cec60bdd87e7b25e19fe13cfae7c578218c44d773  no-stab.patch"
+sha512sums="da1e07a1350d17d11847da89fd9320c81579bba2d589cf5330570f2955ec93bf8aded3937023d0f708f5deccfe74acec620fdb6989a2e1d769e568bcac21a1f3  firefox-23.0.source.tar.bz2
 914e0dfc9a531f6fbff07a9e250e1146371cbffb5eed7fffaa2c5643f8e7759d62d314b3c2dbc5cf9031b66001bbf05892c9ae5aa2b9e77ffe704837a2938f12  mozconfig
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
@@ -146,6 +150,7 @@ sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab
 66c6cb290153e4333ffda0407230a7801149864a69eac6adc130653e7cff28b1fbfd9f20cf0cfd4ee35ae3eb8b2dc6357a48024a8e7005218b44d58efbdcf483  cairo.patch
 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
 0e8d21cd0cec34d7825e59f05669010f9f4bcfb94ca1f5788495cdbd25e9c845d4ca8fa028e599f3464bc4d7827a833708d4513c5082ffbcb5be423318048077  sysconf.patch
-0020796ab970a3e6a207e5a5b93251cc075d749dc642175fd811c7af0618b722a7f7d80d00318edc205cac21d14f8fc0487cdb623a558c5f52e936ae873ce4bc  ns_min.patch
 e975bc5a0f77e29a2afb848cd0c164f9c0edabf0d96472d6b23e2b08fa2bbe3b51ee63c16c986e7fc9bc243c666b23c37d0b939cbf4c258b9dce5c3ee77d6f55  stat.patch
-136e3fc82b77562f53b09e5aa1d81f9db43196b6a1a9bbf271651d022837cb565a6807ce62ce7e99cc40db87edbba2b8b6c198761ac6ebee091c0615e10067dd  moz-libc-filename.patch"
+136e3fc82b77562f53b09e5aa1d81f9db43196b6a1a9bbf271651d022837cb565a6807ce62ce7e99cc40db87edbba2b8b6c198761ac6ebee091c0615e10067dd  moz-libc-filename.patch
+ffb152ff1e80ccb2e215bb2c8542ec912f97a0c6e90bd8b2e3e033b4d909ba788e0aaf8b2bf2c37e1f9592d4105d623801bbccbeb58f580362fb2cd0da52c60b  mozilla-831688.patch
+22e3291aba71deac0fbfaee9f062daabaeb86d606aa3b8a010da51e4ad6d874960b6ad2b6cfbff8769c5ff1cda9d4f0e519c00c3d899fd7d6a3eb1d2be0fd594  no-stab.patch"
diff --git a/main/xulrunner/mozilla-831688.patch b/main/xulrunner/mozilla-831688.patch
new file mode 100644
index 000000000..4548be3f5
--- /dev/null
+++ b/main/xulrunner/mozilla-831688.patch
@@ -0,0 +1,16 @@
+# HG changeset patch
+# Parent ae460fbc4d0e1768578b80b71bf2df8003c908ce
+# User Jan Horak <jhorak@redhat.com>
+diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh
+--- a/xulrunner/confvars.sh
++++ b/xulrunner/confvars.sh
+@@ -15,8 +15,9 @@ MOZ_URL_CLASSIFIER=1
+ MOZ_SERVICES_COMMON=1
+ MOZ_SERVICES_CRYPTO=1
+ MOZ_SERVICES_METRICS=1
+ MOZ_SERVICES_SYNC=1
+ MOZ_MEDIA_NAVIGATOR=1
+ if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
+   MOZ_FOLD_LIBS=1
+ fi
++MOZ_SERVICES_HEALTHREPORT=1
diff --git a/main/xulrunner/no-stab.patch b/main/xulrunner/no-stab.patch
new file mode 100644
index 000000000..76ad5b62c
--- /dev/null
+++ b/main/xulrunner/no-stab.patch
@@ -0,0 +1,14 @@
+--- ./toolkit/crashreporter/google-breakpad/src/common/Makefile.in.orig	2013-07-18 13:40:27.554068574 -0400
++++ ./toolkit/crashreporter/google-breakpad/src/common/Makefile.in	2013-07-18 13:45:20.217384653 -0400
+@@ -77,10 +77,7 @@ TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/
+ DEFINES += -DNO_STABS_SUPPORT
+ else
+ ifneq (WINNT,$(OS_TARGET))
+-CPPSRCS += \
+-  stabs_to_module.cc \
+-  stabs_reader.cc \
+-  $(NULL)
++DEFINES += -DNO_STABS_SUPPORT
+ endif
+ endif
+ 
diff --git a/main/xulrunner/ns_min.patch b/main/xulrunner/ns_min.patch
deleted file mode 100644
index 826a18bfb..000000000
--- a/main/xulrunner/ns_min.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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 + 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);