summaryrefslogtreecommitdiffstats
path: root/main/xulrunner
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-09-24 16:38:59 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2013-09-24 16:39:52 +0200
commit635b86e7ec1694315ddf3b3db675b25f2ab5ec16 (patch)
treeb25cef544858a72d0df3a94b3991b68080c3e265 /main/xulrunner
parent7dd6bfbca5cd07bc6656ba25d546367c76bf7908 (diff)
downloadaports-635b86e7ec1694315ddf3b3db675b25f2ab5ec16.tar.bz2
aports-635b86e7ec1694315ddf3b3db675b25f2ab5ec16.tar.xz
main/xulrunner: upgrade to 24.0
Diffstat (limited to 'main/xulrunner')
-rw-r--r--main/xulrunner/APKBUILD43
-rw-r--r--main/xulrunner/cairo.patch35
-rw-r--r--main/xulrunner/get_nproc.patch29
-rw-r--r--main/xulrunner/mozconfig2
-rw-r--r--main/xulrunner/mozilla-831688.patch16
-rw-r--r--main/xulrunner/no-stab.patch14
-rw-r--r--main/xulrunner/stab.h71
-rw-r--r--main/xulrunner/sysconf.patch10
8 files changed, 119 insertions, 101 deletions
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 3dd4fd5c3..5125e75f5 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=23.0.1
+pkgver=24.0
_ffoxver=$pkgver
-pkgrel=1
+pkgrel=0
pkgdesc="runtime environment for xul-based applications"
url="http://developer.mozilla.org/en/XULRunner"
arch="all"
@@ -50,13 +50,11 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
0002-Use-C99-math-isfinite.patch
0003-xulrunner-jemalloc-aslr.patch
uclibc-malloc_usable_size.patch
- cairo.patch
getchar.patch
- sysconf.patch
+ get_nproc.patch
stat.patch
moz-libc-filename.patch
- mozilla-831688.patch
- no-stab.patch
+ stab.h
"
# help our shared-object scanner to find the libs
@@ -74,7 +72,8 @@ prepare() {
esac
done
- cp "${srcdir}/mozconfig" .mozconfig
+ cp "${srcdir}/mozconfig" .mozconfig || return 1
+ cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
}
build() {
@@ -117,39 +116,33 @@ dev() {
mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
}
-md5sums="0fa25582fb5e0fba37c9f1add8370af2 firefox-23.0.1.source.tar.bz2
-faf16153ed2cf1e5b163fed9168cb34f mozconfig
+md5sums="06a4c0fe8d3a979aea2fce8d0fdbf328 firefox-24.0.source.tar.bz2
+b348970fea1377bb4e9a5271f23cedcb mozconfig
f43c1f0ae57aa8289b130c6de8caf3ce 0002-Use-C99-math-isfinite.patch
e8b3a22d670241bb5c038729ac49a975 0003-xulrunner-jemalloc-aslr.patch
d3d1e831185da3a3e9ddf56c33449c70 uclibc-malloc_usable_size.patch
-6a3942d96c7ce3c63251761cc12c8349 cairo.patch
507742325de8687529e4e81e31132ddf getchar.patch
-760c05f196bb6f152d7f895742e6aa02 sysconf.patch
+9d7d00c019b6bdb0473ff0e63836430f get_nproc.patch
623cd16618c57f037ab4132dfe8694b0 stat.patch
10600ca1b36ff177bf4e301056553cf4 moz-libc-filename.patch
-01f1e791aba776c36c41922c97e74d02 mozilla-831688.patch
-cb9c8a02dfff2421e8380eb0b2954eb6 no-stab.patch"
-sha256sums="bb2c2e99a03859ebd8c02b8bc4c57b39ccc97c55872c2737c433212c0ebe01cf firefox-23.0.1.source.tar.bz2
-ccb0e3841188952b6f9a3e1766b31eec49534080e656ade029be97df6a8c9674 mozconfig
+4383d038b8d8411ea46f4a109197c19e stab.h"
+sha256sums="86a6efa501e1b106b597a8506757f3a2db9d3a5cfcc61ea29a9ad0c834bea83b firefox-24.0.source.tar.bz2
+c6d7723640ef3f6c0207a35c4403a81cce05b6f4db286666be93e336efd53866 mozconfig
2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039 0002-Use-C99-math-isfinite.patch
324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7 0003-xulrunner-jemalloc-aslr.patch
70d93003a95d3a89bd3193d46a278f094a6b983aa660781e4090d58cf1c488a2 uclibc-malloc_usable_size.patch
-519be436124cf9716d3df732e633f5d73c5c9da79bb48447e1d9724baf9b430f cairo.patch
d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4 getchar.patch
-2dacfceeb78d352321a62c950eb50837307c57720719ea6424681c3f5b0ed1fd sysconf.patch
+ce7417acd8ed04adb533532814472de7cae279bbbeffb57b8a99af523f397623 get_nproc.patch
41d55a1d807c84e624da8c258410e8689559d108a4dc56118c6c4755dee514df stat.patch
b2f72d12a2df3bc84d2582d70ec9fc26099bc87c26c303ec5c08ac2e26fe35db moz-libc-filename.patch
-bada0870d4ce77fd955bd8b451b8eb38dd4c614dc3619887db86d040e6ad5bb9 mozilla-831688.patch
-d51a7708188e59b59fa5df4cec60bdd87e7b25e19fe13cfae7c578218c44d773 no-stab.patch"
-sha512sums="d2d2df9c60f90ee458c25380226c7ce743be7a8bf16d9c364da6d98fd19862d7d900daa02092d8148fb8900b7439264a896715386135c5c1818836546916b69d firefox-23.0.1.source.tar.bz2
-914e0dfc9a531f6fbff07a9e250e1146371cbffb5eed7fffaa2c5643f8e7759d62d314b3c2dbc5cf9031b66001bbf05892c9ae5aa2b9e77ffe704837a2938f12 mozconfig
+960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28 stab.h"
+sha512sums="541a26eb939a2cf9a2ec4f4469fdc12008f097c4f615cb196299cbdb855931df5aea288f842dce57e2bb0069ec76e2a748823474e30a6077a9138db5ddb3ee46 firefox-24.0.source.tar.bz2
+1f7759c3b1953d01c19c5d6b320d5b0eeec9d875ae1310be5f3e79032f0dc8c7290ece807bae5dfea6e6a3ff52507bccf9bd463b8933087409f43125b125930e mozconfig
9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26 0002-Use-C99-math-isfinite.patch
46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b 0003-xulrunner-jemalloc-aslr.patch
9845400d4a3c5cc4f0c7a80292c555f8192ba5093f59baed86d63c575aa50d73597588a6236948c25619e9dbaad72508abd91edf16374904d0d8345a94755ffc uclibc-malloc_usable_size.patch
-66c6cb290153e4333ffda0407230a7801149864a69eac6adc130653e7cff28b1fbfd9f20cf0cfd4ee35ae3eb8b2dc6357a48024a8e7005218b44d58efbdcf483 cairo.patch
18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520 getchar.patch
-0e8d21cd0cec34d7825e59f05669010f9f4bcfb94ca1f5788495cdbd25e9c845d4ca8fa028e599f3464bc4d7827a833708d4513c5082ffbcb5be423318048077 sysconf.patch
+f4efb791283b30876d5877623c8d1f7ff2295fd8d004ddd3d221d6ee2701e704ed0221a48130d9ae6c94b097c4e01e5dfe03342345c098571a2408c9a5c755ab get_nproc.patch
e975bc5a0f77e29a2afb848cd0c164f9c0edabf0d96472d6b23e2b08fa2bbe3b51ee63c16c986e7fc9bc243c666b23c37d0b939cbf4c258b9dce5c3ee77d6f55 stat.patch
136e3fc82b77562f53b09e5aa1d81f9db43196b6a1a9bbf271651d022837cb565a6807ce62ce7e99cc40db87edbba2b8b6c198761ac6ebee091c0615e10067dd moz-libc-filename.patch
-ffb152ff1e80ccb2e215bb2c8542ec912f97a0c6e90bd8b2e3e033b4d909ba788e0aaf8b2bf2c37e1f9592d4105d623801bbccbeb58f580362fb2cd0da52c60b mozilla-831688.patch
-22e3291aba71deac0fbfaee9f062daabaeb86d606aa3b8a010da51e4ad6d874960b6ad2b6cfbff8769c5ff1cda9d4f0e519c00c3d899fd7d6a3eb1d2be0fd594 no-stab.patch"
+0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h"
diff --git a/main/xulrunner/cairo.patch b/main/xulrunner/cairo.patch
deleted file mode 100644
index 19ba1ef8e..000000000
--- a/main/xulrunner/cairo.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- firefox/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
-+++ firefox/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
-@@ -446,6 +446,7 @@
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
-+#ifdef MOZ_TREE_CAIRO
- void SourceSnapshotDetached(cairo_surface_t *nullSurf)
- {
- gfxImageSurface* origSurf =
-@@ -453,6 +454,7 @@
-
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-+#endif
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
-@@ -522,6 +524,7 @@
- imgSurface->Stride(),
- format);
-
-+ #ifdef MOZ_TREE_CAIRO
- cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf,
-@@ -530,6 +533,7 @@
- NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf);
-+ #endif
- }
-
- srcBuffer->AddRef();
-
diff --git a/main/xulrunner/get_nproc.patch b/main/xulrunner/get_nproc.patch
new file mode 100644
index 000000000..3e58a9a00
--- /dev/null
+++ b/main/xulrunner/get_nproc.patch
@@ -0,0 +1,29 @@
+--- ./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
+@@ -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 <sys/sysinfo.h>
+ #else // defined(_SC_NPROCESSORS_ONLN)
+ #include <unistd.h>
+@@ -38,7 +38,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(__UCLIBC__)
+ 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/mozconfig b/main/xulrunner/mozconfig
index b2ed27db9..975cc3388 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -28,7 +28,7 @@ ac_add_options --enable-pango
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --disable-javaxpcom
-ac_add_options --disable-crashreporter
+ac_add_options --enable-crashreporter
ac_add_options --enable-safe-browsing
ac_add_options --enable-startup-notification
ac_add_options --enable-extensions=default
diff --git a/main/xulrunner/mozilla-831688.patch b/main/xulrunner/mozilla-831688.patch
deleted file mode 100644
index 4548be3f5..000000000
--- a/main/xulrunner/mozilla-831688.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-# HG changeset patch
-# Parent ae460fbc4d0e1768578b80b71bf2df8003c908ce
-# User Jan Horak <jhorak@redhat.com>
-diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh
---- a/xulrunner/confvars.sh
-+++ b/xulrunner/confvars.sh
-@@ -15,8 +15,9 @@ MOZ_URL_CLASSIFIER=1
- MOZ_SERVICES_COMMON=1
- MOZ_SERVICES_CRYPTO=1
- MOZ_SERVICES_METRICS=1
- MOZ_SERVICES_SYNC=1
- MOZ_MEDIA_NAVIGATOR=1
- if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
- MOZ_FOLD_LIBS=1
- fi
-+MOZ_SERVICES_HEALTHREPORT=1
diff --git a/main/xulrunner/no-stab.patch b/main/xulrunner/no-stab.patch
deleted file mode 100644
index 76ad5b62c..000000000
--- a/main/xulrunner/no-stab.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./toolkit/crashreporter/google-breakpad/src/common/Makefile.in.orig 2013-07-18 13:40:27.554068574 -0400
-+++ ./toolkit/crashreporter/google-breakpad/src/common/Makefile.in 2013-07-18 13:45:20.217384653 -0400
-@@ -77,10 +77,7 @@ TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/
- DEFINES += -DNO_STABS_SUPPORT
- else
- ifneq (WINNT,$(OS_TARGET))
--CPPSRCS += \
-- stabs_to_module.cc \
-- stabs_reader.cc \
-- $(NULL)
-+DEFINES += -DNO_STABS_SUPPORT
- endif
- endif
-
diff --git a/main/xulrunner/stab.h b/main/xulrunner/stab.h
new file mode 100644
index 000000000..6f70af398
--- /dev/null
+++ b/main/xulrunner/stab.h
@@ -0,0 +1,71 @@
+/* $OpenBSD: stab.h,v 1.3 2003/06/02 19:34:12 millert Exp $ */
+/* $NetBSD: stab.h,v 1.4 1994/10/26 00:56:25 cgd Exp $ */
+
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)stab.h 5.2 (Berkeley) 4/4/91
+ */
+
+#ifndef _STAB_H_
+#define _STAB_H_
+
+/*
+ * The following are symbols used by various debuggers and by the Pascal
+ * compiler. Each of them must have one (or more) of the bits defined by
+ * the N_STAB mask set.
+ */
+
+#define N_GSYM 0x20 /* global symbol */
+#define N_FNAME 0x22 /* F77 function name */
+#define N_FUN 0x24 /* procedure name */
+#define N_STSYM 0x26 /* data segment variable */
+#define N_LCSYM 0x28 /* bss segment variable */
+#define N_MAIN 0x2a /* main function name */
+#define N_PC 0x30 /* global Pascal symbol */
+#define N_RSYM 0x40 /* register variable */
+#define N_SLINE 0x44 /* text segment line number */
+#define N_DSLINE 0x46 /* data segment line number */
+#define N_BSLINE 0x48 /* bss segment line number */
+#define N_SSYM 0x60 /* structure/union element */
+#define N_SO 0x64 /* main source file name */
+#define N_LSYM 0x80 /* stack variable */
+#define N_BINCL 0x82 /* include file beginning */
+#define N_SOL 0x84 /* included source file name */
+#define N_PSYM 0xa0 /* parameter variable */
+#define N_EINCL 0xa2 /* include file end */
+#define N_ENTRY 0xa4 /* alternate entry point */
+#define N_LBRAC 0xc0 /* left bracket */
+#define N_EXCL 0xc2 /* deleted include file */
+#define N_RBRAC 0xe0 /* right bracket */
+#define N_BCOMM 0xe2 /* begin common */
+#define N_ECOMM 0xe4 /* end common */
+#define N_ECOML 0xe8 /* end common (local name) */
+#define N_LENG 0xfe /* length of preceding entry */
+
+#endif /* !_STAB_H_ */
diff --git a/main/xulrunner/sysconf.patch b/main/xulrunner/sysconf.patch
deleted file mode 100644
index dfec4ee28..000000000
--- a/main/xulrunner/sysconf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc
-+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/cpu_info.cc
-@@ -21,6 +21,7 @@
- // Not implemented yet, might be possible to use Linux implementation
- #else // defined(WEBRTC_LINUX)
- #include <sys/sysinfo.h>
-+#include <unistd.h>
- #endif
-
- #include "trace.h"