main/xulrunner: upgrade to 26.0

2 files changed, 4 insertions, 45 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 11951835e9..4ad3700bc8 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=25.0.1
+pkgver=26.0
 _ffoxver=$pkgver
 pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
@@ -51,15 +51,9 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 	0003-xulrunner-jemalloc-aslr.patch
 	uclibc-malloc_usable_size.patch
 	getchar.patch
-	get_nproc.patch
 	stat.patch
 	moz-libc-filename.patch
 
-	fix-ipc.patch
-	fix-media.patch
-	fix-netwerk.patch
-	fix-tools.patch
-
 	stab.h
 	"
 
@@ -124,45 +118,30 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="b5b57d3ea937a339e0ed7ebea604b430  firefox-25.0.1.source.tar.bz2
+md5sums="91ce51cc6474f1269484e5327643a59c  firefox-26.0.source.tar.bz2
 4332546696b520412b0dcf2ba8931c06  mozconfig
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
 d3d1e831185da3a3e9ddf56c33449c70  uclibc-malloc_usable_size.patch
 507742325de8687529e4e81e31132ddf  getchar.patch
-b10e9e3c9dd8802145557e8b31ffba1f  get_nproc.patch
 84b101ca9b5f91d3387851e1c42d3908  stat.patch
 86b5eb4bb890a45808cc3a46b99cd8a5  moz-libc-filename.patch
-a070f213f0e52d7873b46206dd96159c  fix-ipc.patch
-1068c9a7ee92544ffd7903a5b11fc1cf  fix-media.patch
-41520f6c013807e6af2c377276efb843  fix-netwerk.patch
-8b84e2c7a9d73e0d42bb5bb52edf696f  fix-tools.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h"
-sha256sums="e5d0667faeec3a0372831b23d0c6804524e134d1ebc4b7e080042491678d4f0b  firefox-25.0.1.source.tar.bz2
+sha256sums="31c4fb2792df63ae450e350380a5e18cf1c51487011a9da0b6cc4bffb69d9812  firefox-26.0.source.tar.bz2
 a5ab8c12da5f266458e7f456205a58ea3bedcce717dae9e2087cf59db9598a64  mozconfig
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
 70d93003a95d3a89bd3193d46a278f094a6b983aa660781e4090d58cf1c488a2  uclibc-malloc_usable_size.patch
 d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
-77670461bec9447ecff8634727d3ef2f177830d19f9f27af6aaa629485472f00  get_nproc.patch
 bcdfc27fb1561beb797ed8e3d14cb7c88de54a5aed2eb33bf84e331a2b0ec200  stat.patch
 889856baa82413afb2f79b7b3e3add626e1ac181efd398e80c434836b793c294  moz-libc-filename.patch
-e6e7aa8d8875f4ed6d8acfc9668f906d8a290d24e25c58d6d5c3ecc5ab3d6778  fix-ipc.patch
-1f9d36e7468f5f157406174f81c0133d41952e2207f93a4a987ecc178cd9b0ac  fix-media.patch
-9681d00c44f6b3873eb97d0a7277c04710da956aa4d08c100cf62c24d03d6a5d  fix-netwerk.patch
-0fdde05d2649a36ec83c46a3864702d3b28009d78099ac5c08dee08e5ab36454  fix-tools.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h"
-sha512sums="7f6cef8dec77d9e43a11f35d5cbae267e71327caa0d63a713ef8579bc45a921c7211d14354da1856d3d7b25c7ca99abf463682873f07fc5a4543c64d589be0f0  firefox-25.0.1.source.tar.bz2
+sha512sums="c0933eeb39aa1d5d83d4c85885b87e0b817d945eec4fe8fc1b15256008f14308fbf98d5a83217c112e1ad247133f839f6ad74156eed7b159d32d0fce26532713  firefox-26.0.source.tar.bz2
 4e3a392276d82a1006351a673b853bd6e7a57f4ae9ec5806edd9e7c8d51edcbaeb32111423088231a7e887490b755ec9701508fe58564fe69dda7eee7b147551  mozconfig
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
 9845400d4a3c5cc4f0c7a80292c555f8192ba5093f59baed86d63c575aa50d73597588a6236948c25619e9dbaad72508abd91edf16374904d0d8345a94755ffc  uclibc-malloc_usable_size.patch
 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
-c9958e9dee7591f2dfd61e95513625085382ffac71c5dcd69f21c5450cf45e78b5550eb1ab64cbbaecf6a4d0b72754fcfa8fed7ae64781f82f216bbdaaa53d53  get_nproc.patch
 478bb56c8e87c5ce6ccf1dd31cfb48be8e1a817e77e3158f633cb48bd269692061f8728589b9cebfac04d484518c2525d61ba4988abe8ea274fdd419ee02ab34  stat.patch
 005d603c4bb90b4ac0d91775cc500416ec218860971a0888316f4d6a92a51f3a67fa30eacbe12c826e589ac0e2ddf3e72eec451382653fd0d557804d4af1e9a6  moz-libc-filename.patch
-4e30548d00c6133c63b7036012a1938e5ff1d4fa3b20ba69782956f8d1fa00dcc36e055f40ebc2238f03d3e791b2f15e3c342b3801f0b0a3536acd35d71f9fc3  fix-ipc.patch
-33497a0dfd98eb3d7c6e705e1cccdc367fecd0ee57924375ec7f0de105595f97ea471ff8e0ba0e3d9cb37680fe10ba82e2af169aa634587701d36d2be96f0d1d  fix-media.patch
-0b96397441a1d42a23e322cdbfcad22ad5b5bc59c7265a7e1a3c4c26381a16a28f31165eb13147ce29174eb5c08ffe885c6df9a1e7b966e0b9c27637830f50ea  fix-netwerk.patch
-beb51596f3baedfcf88d0ad11eb38eb2ec4072236c23f08a01d40dc1d8e32b88cc1472c7fc1a4b043afac8a7d9e76e8b55f61977f77de474fe7a84eec9dbac72  fix-tools.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h"
diff --git a/main/xulrunner/get_nproc.patch b/main/xulrunner/get_nproc.patch
deleted file mode 100644
index 7f97ff7078..0000000000
--- a/main/xulrunner/get_nproc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc.orig	2013-10-25 22:27:35.000000000 +0000
-+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-10-29 10:10:33.578900357 +0000
-@@ -17,7 +17,7 @@
- #include <sys/sysctl.h>
- #elif defined(WEBRTC_ANDROID)
- // Not implemented yet, might be possible to use Linux implementation
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) && !defined(__UCLIBC__)
- #include <unistd.h>  // required for get_nprocs() with uClibc
- #include <sys/sysinfo.h>
- #else // defined(_SC_NPROCESSORS_ONLN)
-@@ -39,7 +39,7 @@
-     WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
-                  "Available number of cores:%d", number_of_cores_);
- 
--#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK)
-+#elif defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_GONK) && defined(__GLIBC__) && !defined(__UCLIBC__)
-     number_of_cores_ = get_nprocs();
-     WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
-                  "Available number of cores:%d", number_of_cores_);