main/xulrunner: upgrade to 25.0

5 files changed, 23 insertions, 43 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index c36ea9dc4..2d5ebadca 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=24.0
+pkgver=25.0
 _ffoxver=$pkgver
 pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
@@ -124,45 +124,45 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="06a4c0fe8d3a979aea2fce8d0fdbf328  firefox-24.0.source.tar.bz2
+md5sums="90ac047e83079a9046192c732e195329  firefox-25.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
-2f9e38b58c68295d5ee175e132d8ed2a  get_nproc.patch
-623cd16618c57f037ab4132dfe8694b0  stat.patch
-10600ca1b36ff177bf4e301056553cf4  moz-libc-filename.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
-af742df21c2912bd458d018f52f68482  fix-tools.patch
+8b84e2c7a9d73e0d42bb5bb52edf696f  fix-tools.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h"
-sha256sums="86a6efa501e1b106b597a8506757f3a2db9d3a5cfcc61ea29a9ad0c834bea83b  firefox-24.0.source.tar.bz2
+sha256sums="5463cc625ac2a06d4d33b43dfb6365da830eef11f3ef5c0512714baaded59272  firefox-25.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
-7724b729cb81b0cbd4a51d529ba8b73dcd25229d46ccb89b9cef2c38d867098b  get_nproc.patch
-41d55a1d807c84e624da8c258410e8689559d108a4dc56118c6c4755dee514df  stat.patch
-b2f72d12a2df3bc84d2582d70ec9fc26099bc87c26c303ec5c08ac2e26fe35db  moz-libc-filename.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
-10bf85bbe8a336b0edfe9216b4d281464cef7194c05984a82a2a9ba5b459406a  fix-tools.patch
+0fdde05d2649a36ec83c46a3864702d3b28009d78099ac5c08dee08e5ab36454  fix-tools.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h"
-sha512sums="541a26eb939a2cf9a2ec4f4469fdc12008f097c4f615cb196299cbdb855931df5aea288f842dce57e2bb0069ec76e2a748823474e30a6077a9138db5ddb3ee46  firefox-24.0.source.tar.bz2
+sha512sums="debec2cc87da1e68739ddadcb35a027cf6f980471c85ea2e6a85f5b0b4861415659c74b5e57b6cb06bcdf6ecf4722e1c08d98a4256aefdf5bf285c9806f5a13f  firefox-25.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
-7ecb250f47df178aacdaf630c3240362a32e13d400461d7799f1fc2d25fbc47043c03ef19ffdeab517e6f9812fe81007460f1485bde243a9d16053dcee37779e  get_nproc.patch
-e975bc5a0f77e29a2afb848cd0c164f9c0edabf0d96472d6b23e2b08fa2bbe3b51ee63c16c986e7fc9bc243c666b23c37d0b939cbf4c258b9dce5c3ee77d6f55  stat.patch
-136e3fc82b77562f53b09e5aa1d81f9db43196b6a1a9bbf271651d022837cb565a6807ce62ce7e99cc40db87edbba2b8b6c198761ac6ebee091c0615e10067dd  moz-libc-filename.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
-6ffbe4d6e9e01cfd1ea949db1f030816fba916544ae3b082959e3b5ad275ea033ead590d66ca453f85943bed55e192a29d476bda31d3a6888fa4eb1123bf6234  fix-tools.patch
+beb51596f3baedfcf88d0ad11eb38eb2ec4072236c23f08a01d40dc1d8e32b88cc1472c7fc1a4b043afac8a7d9e76e8b55f61977f77de474fe7a84eec9dbac72  fix-tools.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h"
diff --git a/main/xulrunner/fix-tools.patch b/main/xulrunner/fix-tools.patch
index 1d0051bb3..8a370b4ab 100644
--- a/main/xulrunner/fix-tools.patch
+++ b/main/xulrunner/fix-tools.patch
@@ -39,17 +39,6 @@
  #ifdef ANDROID
  #include <android/log.h>
  #else
---- mozilla-release/tools.orig/profiler/shared-libraries-linux.cc
-+++ mozilla-release/tools/profiler/shared-libraries-linux.cc
-@@ -14,7 +14,7 @@
- #include "platform.h"
- #include "shared-libraries.h"
- 
--#ifndef __GLIBC__
-+#ifdef ANDRIOD
- /* a crapy version of getline, because it's not included in bionic */
- static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
- {
 --- mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
 +++ mozilla-release/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
 @@ -45,6 +45,7 @@
diff --git a/main/xulrunner/get_nproc.patch b/main/xulrunner/get_nproc.patch
index 6ee7fd323..7f97ff707 100644
--- a/main/xulrunner/get_nproc.patch
+++ b/main/xulrunner/get_nproc.patch
@@ -1,15 +1,15 @@
---- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc.orig	2013-09-17 09:50:51.299150776 +0200
-+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc	2013-09-17 10:16:45.749663438 +0200
+--- ./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)
- #include <unistd.h>
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
      WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                   "Available number of cores:%d", number_of_cores_);
  
@@ -18,12 +18,3 @@
      number_of_cores_ = get_nprocs();
      WEBRTC_TRACE(kTraceStateInfo, kTraceUtility, -1,
                   "Available number of cores:%d", number_of_cores_);
-@@ -64,7 +64,7 @@
-       number_of_cores_ = 1;
-     }
- #elif defined(_SC_NPROCESSORS_ONLN)
--    _numberOfCores = sysconf(_SC_NPROCESSORS_ONLN);
-+    number_of_cores_ = sysconf(_SC_NPROCESSORS_ONLN);
- #else
-     WEBRTC_TRACE(kTraceWarning, kTraceUtility, -1,
-                  "No function to get number of cores");
diff --git a/main/xulrunner/moz-libc-filename.patch b/main/xulrunner/moz-libc-filename.patch
index c8dfa1d84..3e0e0fc3b 100644
--- a/main/xulrunner/moz-libc-filename.patch
+++ b/main/xulrunner/moz-libc-filename.patch
@@ -15,7 +15,7 @@
  dnl ========================================================
  dnl Set CROSS_COMPILE in the environment when running configure
 --- ./toolkit/components/osfile/osfile_unix_allthreads.jsm.orig	2013-06-07 11:06:38.269792499 +0000
-+++ ./toolkit/components/osfile/osfile_unix_allthreads.jsm	2013-06-07 11:09:36.714870364 +0000
++++ ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm	2013-06-07 11:09:36.714870364 +0000
 @@ -39,7 +39,8 @@
  
    // Open libc
diff --git a/main/xulrunner/stat.patch b/main/xulrunner/stat.patch
index d92588e15..9ee6937d1 100644
--- a/main/xulrunner/stat.patch
+++ b/main/xulrunner/stat.patch
@@ -12,8 +12,8 @@
    PROP_END
  };
  
---- ./toolkit/components/osfile/osfile_unix_back.jsm.orig	2013-04-16 19:24:04.196535897 +0000
-+++ ./toolkit/components/osfile/osfile_unix_back.jsm	2013-04-17 06:49:08.869379007 +0000
+--- ./toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2013-04-16 19:24:04.196535897 +0000
++++ ./toolkit/components/osfile/modules/osfile_unix_back.jsm	2013-04-17 06:49:08.869379007 +0000
 @@ -502,7 +502,7 @@
                        /*path*/   Types.fd,
                        /*buf*/    Types.stat.out_ptr