summaryrefslogtreecommitdiffstats
path: root/main/xulrunner
diff options
context:
space:
mode:
Diffstat (limited to 'main/xulrunner')
-rw-r--r--main/xulrunner/APKBUILD6
-rw-r--r--main/xulrunner/mozconfig2
-rw-r--r--main/xulrunner/xulrunner-mozalloc.patch11
3 files changed, 3 insertions, 16 deletions
diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD
index 23c794b1c..24f95afa8 100644
--- a/main/xulrunner/APKBUILD
+++ b/main/xulrunner/APKBUILD
@@ -3,7 +3,7 @@
pkgname=xulrunner
pkgver=8.0.1
_ffoxver=8.0.1
-pkgrel=0
+pkgrel=1
pkgdesc="runtime environment for xul-based applications"
url="http://developer.mozilla.org/en/XULRunner"
arch="all"
@@ -27,7 +27,6 @@ depends_dev="nspr-dev
startup-notification-dev
sqlite-dev
libidl-dev
- fts-dev
mesa-dev"
makedepends="$depends_dev
@@ -52,7 +51,6 @@ source="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}
0004-xulrunner-malloc_usable_size.patch
"
-# xulrunner-mozalloc.patch
_builddir="${srcdir}/mozilla-release"
prepare() {
local i
@@ -105,7 +103,7 @@ dev() {
}
md5sums="b7d09b082e88a74860a51a8e04e29333 firefox-8.0.1.source.tar.bz2
-cc43a2bd96bd2395aa72d0bbb88e5594 mozconfig
+b0f7d491bc800b69ec718667a4b08acb mozconfig
731ec4084e57eb05e93000c971aad0d4 0001-mozilla-pkgconfig.patch.patch
1867db217d10722675c88b655db8c2d7 0002-Use-C99-math-isfinite.patch
7faa279d64c9ec2e7abc7c0497c7e07e 0003-xulrunner-jemalloc-aslr.patch
diff --git a/main/xulrunner/mozconfig b/main/xulrunner/mozconfig
index d0cf2c104..2cbb45b7a 100644
--- a/main/xulrunner/mozconfig
+++ b/main/xulrunner/mozconfig
@@ -30,7 +30,7 @@ ac_add_options --enable-extensions=default
ac_add_options --enable-jemalloc
ac_add_options --disable-elf-hack
-export LIBS="-lfts -lubacktrace"
+# export LIBS="-lubacktrace"
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
diff --git a/main/xulrunner/xulrunner-mozalloc.patch b/main/xulrunner/xulrunner-mozalloc.patch
deleted file mode 100644
index 31027a23e..000000000
--- a/main/xulrunner/xulrunner-mozalloc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla-2.0.orig/memory/mozalloc/mozalloc.cpp
-+++ mozilla-2.0/memory/mozalloc/mozalloc.cpp
-@@ -237,7 +237,7 @@
- return 0;
-
- #if defined(MOZ_MEMORY)
-- return malloc_usable_size(ptr);
-+ return 0;
- #elif defined(XP_MACOSX)
- return malloc_size(ptr);
- #elif defined(XP_WIN)