main/xulrunner: upgrade to 29.0

5 files changed, 15 insertions, 122 deletions

diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index bafd502c9f..ec134945cc 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=28.0
+pkgver=29.0
 _ffoxver=$pkgver
-pkgrel=1
+pkgrel=0
 pkgdesc="runtime environment for xul-based applications"
 url="http://developer.mozilla.org/en/XULRunner"
 arch="all"
@@ -35,6 +35,7 @@ depends_dev="nspr-dev
 makedepends="$depends_dev
 	     autoconf2.13
 
+             sed
 	     python
 	     zip
 	     yasm
@@ -47,13 +48,11 @@ install=""
 options=""
 subpackages="$pkgname-dev $pkgname-dbg"
 source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2
-	bug-947981.patch
 	0002-Use-C99-math-isfinite.patch
 	0003-xulrunner-jemalloc-aslr.patch
 	uclibc-malloc_usable_size.patch
 	getchar.patch
 	stat.patch
-	moz-libc-filename.patch
 	fix-arm-atomics-grsec.patch
 
 	fix-ipc.patch
@@ -96,8 +95,7 @@ build() {
 	unset CFLAGS
 	unset CXXFLAGS
 
-	make -j1 -f client.mk build \
-		MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
+	make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
 }
 
 package() {
@@ -130,54 +128,48 @@ dev() {
 	mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
 }
 
-md5sums="db06b6da6b826cfc6a49c15bca115a6b  firefox-28.0.source.tar.bz2
-f7a5a5c5f549084deaae9206b2c98eb5  bug-947981.patch
+md5sums="07c515fc487824f107a947d23f420e9d  firefox-29.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
-21b2f7d8718acef5804d620a6f6335c0  moz-libc-filename.patch
 b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
 38a9c0d5be155164d50a956ac131d991  fix-ipc.patch
 960d56439a375998ce4e4597bf245375  fix-media.patch
 e1d52fd12bfcf3142028a9ab547cf8d1  fix-netwerk.patch
 781dab1d87caffd53c1e103780261f9c  fix-toolkit.patch
 0814ecfd471de2263af3dcb2d0997746  fix-tools.patch
-5fd05dd07c13dd342aac58aec083dcf0  mozilla-build-arm.patch
+308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h
-4e642df932a46c05c78316402f290eea  mozconfig"
-sha256sums="2ffd0484e7eab52166b851681878a86d54223a6764c756721430fae8e1599628  firefox-28.0.source.tar.bz2
-153c2cc1beb93519562a13ba3c57228bfcfc668f652d2009f1b5c3f9fe974bc2  bug-947981.patch
+941535e6e64fd65453795f81cfb7a7e7  mozconfig"
+sha256sums="64402a1f1359f3ea30767a94977ae823ac25b39c6d54f9fe6db444ed127db892  firefox-29.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
-c3ff0cfd53393211d1026cfe1fab02f195a1cd67eac63c25b132c05a157f5391  moz-libc-filename.patch
 ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomics-grsec.patch
 059a69ff0dbceeaa5bbb1446aa4233bc578a047fcad22c0efa27dc64bbd72980  fix-ipc.patch
 d582712c28a26679d728d21d2ef8964d119182edaf580a948f57a9e808ccc5cf  fix-media.patch
 0cbb512c4526f0881253a38f1cc79061fba0fe6a0d8b321fb506be190a32e571  fix-netwerk.patch
 4f42549663dfedf2a1cdc92d64529750b8a7a9deca6ffc8bdfb91d7d33b7d1c5  fix-toolkit.patch
 f8a0e40e1b666eaed6c5e94d7521776463293618d15cfdf04fb05fb08191b414  fix-tools.patch
-9ad22d98018685db9165f712b3f35591f33acdf6db7223782af24f3778302ce7  mozilla-build-arm.patch
+6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
-3dcc3ed71c3c5a7ec01e7a2c8b41c642a0cbcf61f7c9c649d1080dea2f643b17  mozconfig"
-sha512sums="9334b45d8b56829e7061b87c377aae80e48060e127dfc3eb6a6996590dd92268bd0273203094cdf9aa22fda8128ab9ed1e5fd6fee3e93a430359c0a0631090f7  firefox-28.0.source.tar.bz2
-380da7245bff50d366488ef9b738c789db8108d5fc9fbfe2de85a439827db20bb73c3c2da654401837b0eb5e5b119daf06cdd792889d899b7b3a5df3e5ffcb0b  bug-947981.patch
+a491460be83475f501491bf798dda055504daa38bc1868f98452e2bd378033dd  mozconfig"
+sha512sums="5f40d2862f53ab3551cc2da433c4535027191a808431b8fefd6e87095e33d5539bf633bda25d270af26c32330dd211b003b389aa07f87aa7b97e82b529de78f1  firefox-29.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
-672560d330c55fbfc3d764264efe214503e6da69ef6f295ddfa4923334abcb57dd43988ec8ac67f370fff1083c9a03d6a57a71fcc0a3811ab1231d6ba25806f5  moz-libc-filename.patch
 4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
 3f360d4231355c268fc52e0fedbce5c4f73ad8d60d9424af8641733c0ae181e6226056e605f0d6653b729a9c8e4abe97a9fb2face25938651a7498d5753cea8b  fix-ipc.patch
 58e0e7c1c368530b58aa143be0403d733c4b82cc1a9964c925278e5eff147b2ec2c8c34a6cb217387cb7e9f2ca13c2e299745015edaac510704963282dc68e79  fix-media.patch
 38ebf7ae81d4b6dac0b6840a64f86759fc10e4a7ef26f1ebdc2b7c8d4aab3f95ddcb204a743b307e5dad0cd6c04b278c2311b1ac599e7bb287092c552ed26a51  fix-netwerk.patch
 e9da57c5b33ddde2ad371f66784f193d96cd57da6170f17e0dbdbd62a300645f815ac8e12995457b7a9e76f267c6f9558fc6e744823209df246cc61b53b243a2  fix-toolkit.patch
 7cae3c82c00792011238207a89c76791a03d7fb19460cc465ba3016a1537b901821f5f90bc682cc4413c0a6d626eddbbc7f3dd7878b807d0d490d55760cb7e3b  fix-tools.patch
-be76daca4c53c15524c017d9a76c5892c29e037f73d43af4478c600407553c220ce18e5de3481f6b227fa07b49aa6c83048c5aca9cba534b9589c17d7e78bbd0  mozilla-build-arm.patch
+e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
-518ddaca17202903f5484e832515e45a2579fbe6cc9c0a77322fe00c70d05473d2a46a4d28459881c62b546fd5cefde94d6d7f8821d9244ed1211f4b193b2221  mozconfig"
+e846c897533cea005ba848f3c615584399470ac5c0576f5ae12ae141743afa2380b4c6b205b0dffdcff04e39342cc519fbcf2f94ca1a75f8e1db087811180f71  mozconfig"
diff --git a/main/xulrunner/bug-947981.patch b/main/xulrunner/bug-947981.patch
deleted file mode 100644
index 4eb6eae580..0000000000
--- a/main/xulrunner/bug-947981.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-
-# HG changeset patch
-# User Makoto Kato <m_kato@ga2.so-net.ne.jp>
-# Date 1387329615 -32400
-# Node ID 82f8fd52a774837c84cc4d178e158ab2055e9a57
-# Parent  41a8213774080c318e8a6ba52a78a9c50e018f29
-Bug 947981 - broken --with-system-icu build. r=glandium
-
-diff --git a/configure.in b/configure.in
---- a/configure.in
-+++ b/configure.in
-@@ -3909,16 +3909,17 @@ MOZ_NATIVE_ICU=
- MOZ_ARG_WITH_BOOL(system-icu,
- [  --with-system-icu
-                           Use system ICU (located with pkgconfig)],
-     MOZ_NATIVE_ICU=1)
- 
- if test -n "$MOZ_NATIVE_ICU"; then
-     PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-     MOZ_JS_STATIC_LIBS="$MOZ_JS_STATIC_LIBS $MOZ_ICU_LIBS"
-+    MOZ_SHARED_ICU=1
- fi
- 
- AC_SUBST(MOZ_NATIVE_ICU)
- 
- dnl ========================================================
- dnl Java SDK support
- dnl ========================================================
- 
-diff --git a/js/src/config/Makefile.in b/js/src/config/Makefile.in
---- a/js/src/config/Makefile.in
-+++ b/js/src/config/Makefile.in
-@@ -31,17 +31,16 @@ include $(topsrcdir)/config/rules.mk
- 
- HOST_CFLAGS += -DUNICODE -D_UNICODE
- 
- ifdef WRAP_SYSTEM_INCLUDES
- export:: \
-   $(call mkdir_deps,system_wrappers_js) \
-   $(NULL)
- 	$(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
--		-DMOZ_NATIVE_ICU=$(MOZ_NATIVE_ICU) \
- 		$(srcdir)/system-headers | $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers_js
- 	$(INSTALL) system_wrappers_js $(DIST)
- 
- GARBAGE_DIRS += system_wrappers_js
- endif
- 
- GARBAGE += $(srcdir)/*.pyc *.pyc
- 
-diff --git a/js/src/configure.in b/js/src/configure.in
---- a/js/src/configure.in
-+++ b/js/src/configure.in
-@@ -4160,16 +4160,17 @@ ICU_LIB_NAMES=
- MOZ_NATIVE_ICU=
- MOZ_ARG_WITH_BOOL(system-icu,
- [  --with-system-icu
-                           Use system ICU (located with pkgconfig)],
-     MOZ_NATIVE_ICU=1)
- 
- if test -n "$MOZ_NATIVE_ICU"; then
-     PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-+    MOZ_SHARED_ICU=1
- fi
- 
- MOZ_ARG_WITH_STRING(intl-api,
- [  --with-intl-api, --with-intl-api=build, --without-intl-api
-     Determine the status of the ECMAScript Internationalization API.  The first
-     (or lack of any of these) builds and exposes the API.  The second builds it
-     but doesn't use ICU or expose the API to script.  The third doesn't build
-     ICU at all.],
-
diff --git a/main/xulrunner/moz-libc-filename.patch b/main/xulrunner/moz-libc-filename.patch
deleted file mode 100644
index 166d03f3c0..0000000000
--- a/main/xulrunner/moz-libc-filename.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig	2014-04-03 13:38:04.304500945 +0000
-+++ ./toolkit/components/osfile/modules/osfile_unix_allthreads.jsm	2014-04-03 13:41:51.910587459 +0000
-@@ -40,8 +40,8 @@
- 
- // Open libc
- let libc;
--let libc_candidates =  [ "libSystem.B.dylib",
--                         "libc.so.6",
-+let libc_candidates =  [ "a.out",
-+			 "libSystem.B.dylib",
-                          "libc.so" ];
- for (let i = 0; i < libc_candidates.length; ++i) {
-   try {
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index e16cc2b43a..e197e65e54 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -36,11 +36,8 @@ ac_add_options --enable-gio
 ac_add_options --enable-gstreamer
 ac_add_options --with-system-icu
 ac_add_options --disable-pulseaudio
-#uclibc#ac_add_options --enable-jemalloc
-#uclibc#ac_add_options --enable-replace-malloc
-#uclibc#ac_add_options --enable-crashreporter
-#musl#ac_add_options --disable-jemalloc
-#musl#ac_add_options --disable-crashreporter
+ac_add_options --disable-jemalloc
+ac_add_options --disable-crashreporter
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/main/xulrunner/mozilla-build-arm.patch b/main/xulrunner/mozilla-build-arm.patch
index 742168e31e..dcf2f6d8a4 100644
--- a/main/xulrunner/mozilla-build-arm.patch
+++ b/main/xulrunner/mozilla-build-arm.patch
@@ -9,14 +9,3 @@
      SOURCES += [
          'yuv_row_arm.s',
      ]
---- ./media/libtheora/lib/moz.build.orig	2014-04-03 13:50:38.990296661 +0000
-+++ ./media/libtheora/lib/moz.build	2014-04-03 13:53:46.259228947 +0000
-@@ -20,7 +20,7 @@
-     'state.c',
- ]
- 
--if CONFIG['OS_TEST'] == 'arm' and CONFIG['GNU_AS']:
-+if CONFIG['HAVE_ARM_NEON'] and CONFIG['GNU_AS']:
-     GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
-         'armbits-gnu',
-         'armfrag-gnu',