main/xulrunner: upgrade to 31.0

3 files changed, 27 insertions, 22 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 824097aed2..a7664f83f3 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=30.0
+pkgver=31.0
 _ffoxver=$pkgver
 pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
@@ -128,7 +128,7 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="ac7e8c801ded4e6195182bf54c81acb6  firefox-30.0.source.tar.bz2
+md5sums="499b70a9f08a2291d528e87eaf8804a3  firefox-31.0.source.tar.bz2
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
 507742325de8687529e4e81e31132ddf  getchar.patch
@@ -138,12 +138,12 @@ b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
 960d56439a375998ce4e4597bf245375  fix-media.patch
 ce4839160acf3986a2118326ed2b8444  fix-media-webrtc.patch
 170b8e7f8cab21f0965f226c291a57f9  fix-netwerk.patch
-781dab1d87caffd53c1e103780261f9c  fix-toolkit.patch
-0814ecfd471de2263af3dcb2d0997746  fix-tools.patch
+296954be4c6d6bfcc24d0a46a2bd7d74  fix-toolkit.patch
+2279c55a85013fc1c0d01427768edd4d  fix-tools.patch
 308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h
 7701fb5564182cced00b2b45bce39685  mozconfig"
-sha256sums="1e95740a8cf7095e210fb6a2313c4d0fba4fdf44ee7c327d01f202638403c22c  firefox-30.0.source.tar.bz2
+sha256sums="95c789f2f171c4c7bd832999a22bfa9461ac47ba33e97a46392c90e576baf9db  firefox-31.0.source.tar.bz2
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
 d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
@@ -153,12 +153,12 @@ ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomic
 d582712c28a26679d728d21d2ef8964d119182edaf580a948f57a9e808ccc5cf  fix-media.patch
 3e53af8beff122bcf5790c148fb51f41f44b6fe5dd5799777b70c3542c32cb93  fix-media-webrtc.patch
 4a2f8ff5e9b1359541eba8854098cee2caeb40ad9dbdc4b8fcf48b47ea8ca2d2  fix-netwerk.patch
-4f42549663dfedf2a1cdc92d64529750b8a7a9deca6ffc8bdfb91d7d33b7d1c5  fix-toolkit.patch
-f8a0e40e1b666eaed6c5e94d7521776463293618d15cfdf04fb05fb08191b414  fix-tools.patch
+666883189dba3f4c7ba6b5bc85026c85bcb84477c2d5ba00d6414ddd0f744368  fix-toolkit.patch
+60ed0870119480994c6c455034c52dd21b8482b7617c3a0032e3b2abf4467e4d  fix-tools.patch
 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
 bfc5a101a6a50490dc865b4b7cae94be5e4fad9ecd6b5bcccdd8380eeb1d1a71  mozconfig"
-sha512sums="20c4db40a0b539ecc971f892c4b1e95eebd8a34bed89c74cc0ed33be4a845ef2dac357945dce3721d09088962dc3ab2336fde2f9cb6ce0e6d8e42d36d4e3f7de  firefox-30.0.source.tar.bz2
+sha512sums="43e8f538591afde4c1bb4f0651df32a77456c5445204d0538d90112258e1f2cc90b822777799b96b97682b8fc1d8b5648dd3e3648a9392db0dc432c1e8520c85  firefox-31.0.source.tar.bz2
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
@@ -168,8 +168,8 @@ sha512sums="20c4db40a0b539ecc971f892c4b1e95eebd8a34bed89c74cc0ed33be4a845ef2dac3
 58e0e7c1c368530b58aa143be0403d733c4b82cc1a9964c925278e5eff147b2ec2c8c34a6cb217387cb7e9f2ca13c2e299745015edaac510704963282dc68e79  fix-media.patch
 a5d00272fc9e2b3a786f5891bac11b04ffaf6dfcbd2b30cba42286b79d12fefb6cb9c81e6d75987ab3ee19d12af20a074c77edc655bd470be06f5025eb38e609  fix-media-webrtc.patch
 8a896ee4d1465a844351cec84217de1a28b9f27bfc1e34cc71368664b5b8804bd66bdcadc78c78ee365abd1d0cafed1e6c568045c93cb78ac94e2818f503d58c  fix-netwerk.patch
-e9da57c5b33ddde2ad371f66784f193d96cd57da6170f17e0dbdbd62a300645f815ac8e12995457b7a9e76f267c6f9558fc6e744823209df246cc61b53b243a2  fix-toolkit.patch
-7cae3c82c00792011238207a89c76791a03d7fb19460cc465ba3016a1537b901821f5f90bc682cc4413c0a6d626eddbbc7f3dd7878b807d0d490d55760cb7e3b  fix-tools.patch
+72459754016f254c58d56d9a8719897fa8da9cf969eaa498e1e755457942d3f0ac56e4abd3f6a66ef924c94aa034d0af18a1fb653926b2496f0c2615fdb24c5e  fix-toolkit.patch
+426b57ce698de3eecd1b52f2998974c4e0b5922584b09b554d436c61fee039d1f86345e746fee067801ebbf50815c4d19b96266a2ed72a35ae5c3edbdb57bba1  fix-tools.patch
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
 0cb16f394a3946a2bb31ef0084d8bbdc8e0e897d67c9224251d73fded07ab2fb193fcd8e5dd03109a3572a2455c44350b658cc64e2f981d047f45c8ade3afcf8  mozconfig"
diff --git a/main/xulrunner/fix-toolkit.patch b/main/xulrunner/fix-toolkit.patch
index 647aa9f70e..0303223652 100644
--- a/main/xulrunner/fix-toolkit.patch
+++ b/main/xulrunner/fix-toolkit.patch
@@ -50,18 +50,6 @@ diff -ru mozilla-release/toolkit.orig/crashreporter/google-breakpad/src/third_pa
  
      LSS_INLINE _syscall4(int, newfstatat,         int,   d,
                           const char *,            p,
-diff -ru mozilla-release/toolkit.orig/library/Makefile.in mozilla-release/toolkit/library/Makefile.in
---- mozilla-release/toolkit.orig/library/Makefile.in	2014-03-15 05:19:37.000000000 +0000
-+++ mozilla-release/toolkit/library/Makefile.in	2014-04-17 10:24:56.780511957 +0000
-@@ -199,7 +199,7 @@
- endif
- 
- 
--ifdef MOZ_ALSA
-+ifdef MOZ_ALSA_LIBS
- EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
- endif
- 
 diff -ru mozilla-release/toolkit.orig/mozapps/update/common/updatedefines.h mozilla-release/toolkit/mozapps/update/common/updatedefines.h
 --- mozilla-release/toolkit.orig/mozapps/update/common/updatedefines.h	2014-03-15 05:19:37.000000000 +0000
 +++ mozilla-release/toolkit/mozapps/update/common/updatedefines.h	2014-04-17 10:24:33.793431933 +0000
diff --git a/main/xulrunner/fix-tools.patch b/main/xulrunner/fix-tools.patch
index bd468991ec..b0a6d4fbcc 100644
--- a/main/xulrunner/fix-tools.patch
+++ b/main/xulrunner/fix-tools.patch
@@ -30,3 +30,20 @@
  #ifdef ANDROID
  #include <android/log.h>
  #else
+--- mozilla-release.orig/tools/profiler/LulElf.cpp
++++ mozilla-release/tools/profiler/LulElf.cpp
+@@ -579,10 +579,10 @@
+ // Return the non-directory portion of FILENAME: the portion after the
+ // last slash, or the whole filename if there are no slashes.
+ string BaseFileName(const string &filename) {
+-  // Lots of copies!  basename's behavior is less than ideal.
+-  char *c_filename = strdup(filename.c_str());
+-  string base = basename(c_filename);
+-  free(c_filename);
++  // basename's behavior is less than ideal so avoid it
++  const char *c_filename = filename.c_str();
++  const char *p = strrchr(c_filename, '/');
++  string base = p ? p+1 : c_filename;
+   return base;
+ }
+