aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-10-09 09:27:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-10-09 10:00:57 +0000
commit4ef8b328181ec3ceb16a849dd0296430563e2fbb (patch)
tree9a1e03ee031a9a08cedb219c043df99b0f3f1aff /main
parent73761cf3aa7c7733d4ce26033d6ce7470298e279 (diff)
downloadaports-4ef8b328181ec3ceb16a849dd0296430563e2fbb.tar.bz2
aports-4ef8b328181ec3ceb16a849dd0296430563e2fbb.tar.xz
main/xulrunner: upgrade to 16.0
Diffstat (limited to 'main')
-rw-r--r--main/xulrunner/0003-xulrunner-jemalloc-aslr.patch4
-rw-r--r--main/xulrunner/APKBUILD13
-rw-r--r--main/xulrunner/mozconfig5
-rw-r--r--main/xulrunner/uclibc-malloc_usable_size.patch2
4 files changed, 16 insertions, 8 deletions
diff --git a/main/xulrunner/0003-xulrunner-jemalloc-aslr.patch b/main/xulrunner/0003-xulrunner-jemalloc-aslr.patch
index 6784b13e74..7aa00009f0 100644
--- a/main/xulrunner/0003-xulrunner-jemalloc-aslr.patch
+++ b/main/xulrunner/0003-xulrunner-jemalloc-aslr.patch
@@ -9,8 +9,8 @@ Subject: [PATCH 3/4] xulrunner: jemalloc aslr
diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
index ad7c450..91de92c 100644
---- a/memory/jemalloc/jemalloc.c
-+++ b/memory/jemalloc/jemalloc.c
+--- a/memory/mozjemalloc/jemalloc.c
++++ b/memory/mozjemalloc/jemalloc.c
@@ -410,7 +410,7 @@ void *_mmap(void *addr, size_t length, int prot, int flags,
static const bool __isthreaded = true;
#endif
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 962c6ed25a..dd3bc6efb6 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=xulrunner
-pkgver=15.0.1
+pkgver=16.0
_ffoxver=$pkgver
pkgrel=0
pkgdesc="runtime environment for xul-based applications"
@@ -14,12 +14,15 @@ depends_dev="nspr-dev
gtk+-dev
dbus-glib-dev
alsa-lib-dev
+ gstreamer-dev
+ gst-plugins-base-dev
libvorbis-dev
libogg-dev
libtheora-dev
wireless-tools-dev
libnotify-dev
libevent-dev
+ libvpx-dev
libxt-dev
jpeg-dev
bzip2-dev
@@ -106,9 +109,9 @@ dev() {
mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include
}
-md5sums="743ba71fbce7b32023405db02d44143f firefox-15.0.1.source.tar.bz2
-b0f7d491bc800b69ec718667a4b08acb mozconfig
+md5sums="04cbefaebaf77693bacd11145ece104f firefox-16.0.source.tar.bz2
+36d8d42ae4375f1190c9558bb0d10fa7 mozconfig
f43c1f0ae57aa8289b130c6de8caf3ce 0002-Use-C99-math-isfinite.patch
-7faa279d64c9ec2e7abc7c0497c7e07e 0003-xulrunner-jemalloc-aslr.patch
-48b7d0404b45b15b8ae4a7d08ac95db3 uclibc-malloc_usable_size.patch
+e8b3a22d670241bb5c038729ac49a975 0003-xulrunner-jemalloc-aslr.patch
+1ce894c4f6a4541fdccf0b4a8b1dd95b uclibc-malloc_usable_size.patch
6a3942d96c7ce3c63251761cc12c8349 cairo.patch"
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index 2cbb45b7ae..6b34a02def 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -8,9 +8,12 @@ ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --with-system-pixman
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
ac_add_options --enable-system-cairo
+ac_add_options --enable-system-ffi
ac_add_options --with-pthreads
ac_add_options --enable-strip
ac_add_options --disable-tests
@@ -29,10 +32,12 @@ ac_add_options --enable-startup-notification
ac_add_options --enable-extensions=default
ac_add_options --enable-jemalloc
ac_add_options --disable-elf-hack
+ac_add_options --enable-gio
# export LIBS="-lubacktrace"
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
+export MOZ_JEMALLOC=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
diff --git a/main/xulrunner/uclibc-malloc_usable_size.patch b/main/xulrunner/uclibc-malloc_usable_size.patch
index b198e2cc56..4d088787c3 100644
--- a/main/xulrunner/uclibc-malloc_usable_size.patch
+++ b/main/xulrunner/uclibc-malloc_usable_size.patch
@@ -29,7 +29,7 @@
include $(DEPTH)/config/autoconf.mk
+ifdef MOZ_MEMORY
-+SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc)
++SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) $(call EXPAND_LIBNAME_PATH,memory,../build)
+endif
+
VISIBILITY_FLAGS=