main/xulrunner: upgrade to 30.0

4 files changed, 29 insertions, 98 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index f34dfe9788..824097aed2 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=29.0.1
+pkgver=30.0
 _ffoxver=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -14,8 +14,8 @@ depends_dev="nspr-dev
 	     gtk+-dev
 	     dbus-glib-dev
 	     alsa-lib-dev
-	     gstreamer-dev
-	     gst-plugins-base-dev
+	     gstreamer1-dev
+	     gst-plugins-base1-dev
 	     libvorbis-dev
 	     libogg-dev
 	     libtheora-dev
@@ -50,7 +50,6 @@ subpackages="$pkgname-dev $pkgname-dbg"
 source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
 	0002-Use-C99-math-isfinite.patch
 	0003-xulrunner-jemalloc-aslr.patch
-	uclibc-malloc_usable_size.patch
 	getchar.patch
 	stat.patch
 	fix-arm-atomics-grsec.patch
@@ -129,51 +128,48 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="ca37addc3a69ef30247e00375dd93cd0  firefox-29.0.1.source.tar.bz2
+md5sums="ac7e8c801ded4e6195182bf54c81acb6  firefox-30.0.source.tar.bz2
 f43c1f0ae57aa8289b130c6de8caf3ce  0002-Use-C99-math-isfinite.patch
 e8b3a22d670241bb5c038729ac49a975  0003-xulrunner-jemalloc-aslr.patch
-f2e5631a1b7a338c2b80b038630647c8  uclibc-malloc_usable_size.patch
 507742325de8687529e4e81e31132ddf  getchar.patch
 d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
 b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
 38a9c0d5be155164d50a956ac131d991  fix-ipc.patch
 960d56439a375998ce4e4597bf245375  fix-media.patch
 ce4839160acf3986a2118326ed2b8444  fix-media-webrtc.patch
-e1d52fd12bfcf3142028a9ab547cf8d1  fix-netwerk.patch
+170b8e7f8cab21f0965f226c291a57f9  fix-netwerk.patch
 781dab1d87caffd53c1e103780261f9c  fix-toolkit.patch
 0814ecfd471de2263af3dcb2d0997746  fix-tools.patch
 308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h
-941535e6e64fd65453795f81cfb7a7e7  mozconfig"
-sha256sums="813e09f9ca4cd9d34648b54f657164817c221874854bd0d316ed859ed7accea2  firefox-29.0.1.source.tar.bz2
+7701fb5564182cced00b2b45bce39685  mozconfig"
+sha256sums="1e95740a8cf7095e210fb6a2313c4d0fba4fdf44ee7c327d01f202638403c22c  firefox-30.0.source.tar.bz2
 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039  0002-Use-C99-math-isfinite.patch
 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7  0003-xulrunner-jemalloc-aslr.patch
-96cfbf558f0d2ef3aba71d32b670b26eb77a0d88fdee4192d3957d2b527d6dce  uclibc-malloc_usable_size.patch
 d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
 a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
 ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomics-grsec.patch
 059a69ff0dbceeaa5bbb1446aa4233bc578a047fcad22c0efa27dc64bbd72980  fix-ipc.patch
 d582712c28a26679d728d21d2ef8964d119182edaf580a948f57a9e808ccc5cf  fix-media.patch
 3e53af8beff122bcf5790c148fb51f41f44b6fe5dd5799777b70c3542c32cb93  fix-media-webrtc.patch
-0cbb512c4526f0881253a38f1cc79061fba0fe6a0d8b321fb506be190a32e571  fix-netwerk.patch
+4a2f8ff5e9b1359541eba8854098cee2caeb40ad9dbdc4b8fcf48b47ea8ca2d2  fix-netwerk.patch
 4f42549663dfedf2a1cdc92d64529750b8a7a9deca6ffc8bdfb91d7d33b7d1c5  fix-toolkit.patch
 f8a0e40e1b666eaed6c5e94d7521776463293618d15cfdf04fb05fb08191b414  fix-tools.patch
 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
-a491460be83475f501491bf798dda055504daa38bc1868f98452e2bd378033dd  mozconfig"
-sha512sums="a1ebff4f4f3359bed54eae229e54de22a92adb0dbfe627a71e8e4e41330c9fbe17e238aafe1342a377a7cb96f2b26e23c723238800a8e91dba21d8b6feedbe35  firefox-29.0.1.source.tar.bz2
+bfc5a101a6a50490dc865b4b7cae94be5e4fad9ecd6b5bcccdd8380eeb1d1a71  mozconfig"
+sha512sums="20c4db40a0b539ecc971f892c4b1e95eebd8a34bed89c74cc0ed33be4a845ef2dac357945dce3721d09088962dc3ab2336fde2f9cb6ce0e6d8e42d36d4e3f7de  firefox-30.0.source.tar.bz2
 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26  0002-Use-C99-math-isfinite.patch
 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b  0003-xulrunner-jemalloc-aslr.patch
-a74d08b978df2f836b7905fff497304fa189fda22ca070a25b5d4be6e764aa74094a08359dc9a560de835f201dcd5bb610ad4090b4219d0f0f1aade1b4c4e504  uclibc-malloc_usable_size.patch
 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
 1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7  stat.patch
 4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
 3f360d4231355c268fc52e0fedbce5c4f73ad8d60d9424af8641733c0ae181e6226056e605f0d6653b729a9c8e4abe97a9fb2face25938651a7498d5753cea8b  fix-ipc.patch
 58e0e7c1c368530b58aa143be0403d733c4b82cc1a9964c925278e5eff147b2ec2c8c34a6cb217387cb7e9f2ca13c2e299745015edaac510704963282dc68e79  fix-media.patch
 a5d00272fc9e2b3a786f5891bac11b04ffaf6dfcbd2b30cba42286b79d12fefb6cb9c81e6d75987ab3ee19d12af20a074c77edc655bd470be06f5025eb38e609  fix-media-webrtc.patch
-38ebf7ae81d4b6dac0b6840a64f86759fc10e4a7ef26f1ebdc2b7c8d4aab3f95ddcb204a743b307e5dad0cd6c04b278c2311b1ac599e7bb287092c552ed26a51  fix-netwerk.patch
+8a896ee4d1465a844351cec84217de1a28b9f27bfc1e34cc71368664b5b8804bd66bdcadc78c78ee365abd1d0cafed1e6c568045c93cb78ac94e2818f503d58c  fix-netwerk.patch
 e9da57c5b33ddde2ad371f66784f193d96cd57da6170f17e0dbdbd62a300645f815ac8e12995457b7a9e76f267c6f9558fc6e744823209df246cc61b53b243a2  fix-toolkit.patch
 7cae3c82c00792011238207a89c76791a03d7fb19460cc465ba3016a1537b901821f5f90bc682cc4413c0a6d626eddbbc7f3dd7878b807d0d490d55760cb7e3b  fix-tools.patch
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
-e846c897533cea005ba848f3c615584399470ac5c0576f5ae12ae141743afa2380b4c6b205b0dffdcff04e39342cc519fbcf2f94ca1a75f8e1db087811180f71  mozconfig"
+0cb16f394a3946a2bb31ef0084d8bbdc8e0e897d67c9224251d73fded07ab2fb193fcd8e5dd03109a3572a2455c44350b658cc64e2f981d047f45c8ade3afcf8  mozconfig"
diff --git a/main/xulrunner/fix-netwerk.patch b/main/xulrunner/fix-netwerk.patch
index 6b9645ec3a..a31b286229 100644
--- a/main/xulrunner/fix-netwerk.patch
+++ b/main/xulrunner/fix-netwerk.patch
@@ -1,76 +1,37 @@
---- mozilla-release/netwerk.orig/sctp/src/netinet/sctp_bsd_addr.c
-+++ mozilla-release/netwerk/sctp/src/netinet/sctp_bsd_addr.c
-@@ -52,8 +52,6 @@
- #if defined(ANDROID)
- #include <unistd.h>
- #include <ifaddrs-android-ext.h>
--#else
--#include <sys/unistd.h>
- #endif
- #endif
- 
---- mozilla-release/netwerk.orig/sctp/src/netinet/sctp_os_userspace.h
-+++ mozilla-release/netwerk/sctp/src/netinet/sctp_os_userspace.h
-@@ -381,11 +381,8 @@
+--- ./netwerk.orig/sctp/src/netinet/sctp_os_userspace.h
++++ ./netwerk/sctp/src/netinet/sctp_os_userspace.h
+@@ -400,11 +400,8 @@
  };
  
  #else /* !defined(Userspace_os_Windows) */
 -#include <sys/cdefs.h> /* needed? added from old __FreeBSD__ */
  #include <sys/socket.h>
--#if defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
+-#if defined(__Userspace_os_DragonFly) || defined(__Userspace_os_FreeBSD) || defined(__Userspace_os_Linux) || defined(__Userspace_os_NetBSD) || defined(__Userspace_os_OpenBSD) || defined(ANDROID)
  #include <pthread.h>
 -#endif
  typedef pthread_mutex_t userland_mutex_t;
  typedef pthread_cond_t userland_cond_t;
  typedef pthread_t userland_thread_t;
---- mozilla-release/netwerk.orig/sctp/src/netinet/sctp_pcb.c
-+++ mozilla-release/netwerk/sctp/src/netinet/sctp_pcb.c
-@@ -30,6 +30,8 @@
+--- ./netwerk.orig/sctp/src/netinet/sctp_pcb.c
++++ ./netwerk/sctp/src/netinet/sctp_pcb.c
+@@ -30,6 +30,9 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#define _BSD_SOURCE /* for IPPORT_RESERVED */
++#include <netdb.h>
 +
  #ifdef __FreeBSD__
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 246687 2013-02-11 21:02:49Z tuexen $");
-@@ -69,11 +71,10 @@
- #endif
- #if defined(__Userspace__)
- #if !defined(__Userspace_os_Windows)
--#if defined(ANDROID)
-+#include <netdb.h>
- #include <unistd.h>
-+#if defined(ANDROID)
- #include <ifaddrs-android-ext.h>
--#else
--#include <sys/unistd.h>
- #endif
- #endif
- #include <user_socketvar.h>
---- mozilla-release/netwerk.orig/sctp/src/user_queue.h
-+++ mozilla-release/netwerk/sctp/src/user_queue.h
-@@ -31,9 +31,6 @@
+ __FBSDID("$FreeBSD: head/sys/netinet/sctp_pcb.c 258765 2013-11-30 12:51:19Z tuexen $");
+--- ./netwerk.orig/sctp/src/user_queue.h
++++ ./netwerk/sctp/src/user_queue.h
+@@ -31,7 +31,7 @@
  #ifndef _USER_QUEUE_H_
  #define	_USER_QUEUE_H_
  
 -#if !defined (__Userspace_os_Windows)
--#include <sys/cdefs.h>
--#endif
- /*
-  * This file defines four types of data structures: singly-linked lists,
-  * singly-linked tail queues, lists and tail queues.
---- mozilla-release/netwerk.orig/sctp/src/user_environment.c
-+++ mozilla-release/netwerk/sctp/src/user_environment.c
-@@ -33,11 +33,6 @@
- #include <stdlib.h>
- #if !defined (__Userspace_os_Windows)
- #include <stdint.h>
--#if !defined(__Userspace_os_FreeBSD)
--#if !defined(ANDROID)
--#include <sys/sysctl.h>
--#endif
--#endif
- #include <netinet/sctp_os_userspace.h>
++#if defined(__Userspace_os_FreeBSD)
+ #include <sys/cdefs.h>
  #endif
- #include <user_environment.h>
+ /*
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index e197e65e54..24d10221da 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -33,7 +33,7 @@ ac_add_options --enable-startup-notification
 ac_add_options --enable-extensions=default
 ac_add_options --disable-elf-hack
 ac_add_options --enable-gio
-ac_add_options --enable-gstreamer
+ac_add_options --enable-gstreamer=1.0
 ac_add_options --with-system-icu
 ac_add_options --disable-pulseaudio
 ac_add_options --disable-jemalloc
diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch
deleted file mode 100644
index f9e726d55b..0000000000
--- a/main/xulrunner/uclibc-malloc_usable_size.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru mozilla-release.orig/memory/mozalloc/Makefile.in mozilla-release/memory/mozalloc/Makefile.in
---- mozilla-release.orig/memory/mozalloc/Makefile.in	2014-03-15 05:19:31.000000000 +0000
-+++ mozilla-release/memory/mozalloc/Makefile.in	2014-04-17 12:57:18.819942458 +0000
-@@ -3,6 +3,10 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
-+ifdef MOZ_MEMORY
-+SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) $(call EXPAND_LIBNAME_PATH,memory,../build)
-+endif
-+
- STL_FLAGS	=
- ifdef _MSC_VER
- STL_FLAGS	= -D_HAS_EXCEPTIONS=0
-diff -ru mozilla-release.orig/memory/mozalloc/mozalloc.cpp mozilla-release/memory/mozalloc/mozalloc.cpp
---- mozilla-release.orig/memory/mozalloc/mozalloc.cpp	2014-03-15 05:19:31.000000000 +0000
-+++ mozilla-release/memory/mozalloc/mozalloc.cpp	2014-04-17 12:55:15.007704929 +0000
-@@ -28,7 +28,7 @@
- #include "mozilla/mozalloc_oom.h"  // for mozalloc_handle_oom
- 
- /* Windows doesn't have malloc_usable_size, but jemalloc has */
--#if defined(MOZ_MEMORY_WINDOWS)
-+#if defined(MOZ_MEMORY_WINDOWS) || defined(__UCLIBC__)
- extern "C" size_t malloc_usable_size(const void *ptr);
- #endif
-