summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-libs/xulrunner/ChangeLog6
-rw-r--r--net-libs/xulrunner/Manifest5
-rw-r--r--net-libs/xulrunner/files/801-enable-x86_64-tracemonkey.patch25
-rw-r--r--net-libs/xulrunner/xulrunner-1.9.2.7.ebuild5
4 files changed, 37 insertions, 4 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index 35df9dac8063..cd9b1d92d9a0 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/xulrunner
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.329 2010/07/21 10:01:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.330 2010/07/21 13:18:52 polynomial-c Exp $
+
+ 21 Jul 2010; Lars Wendler <polynomial-c@gentoo.org>
+ +files/801-enable-x86_64-tracemonkey.patch, xulrunner-1.9.2.7.ebuild:
+ Enable tracemonkey on amd64 (bug #315997)
*xulrunner-1.9.2.7 (21 Jul 2010)
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index 25320c9e749b..f74d0a4a54d5 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -3,6 +3,7 @@ AUX 066-fix-includedir-mozilla-js.patch 747 RMD160 39c4430f77e42f5f5ad5f8038c036
AUX 1000_fix_alignment.patch 796 RMD160 d6098c483a90d47ead8cc7c643bf51270465b4cd SHA1 d2e861a0892550659a152d6a4ae9a1d31996c800 SHA256 49675bf2771b3e1bc50069f3a07f96062c771e8281d8e5abc2219dd08a23d377
AUX 1002_fix-system-hunspell-dict-detections.patch 3394 RMD160 5db17109743eeff4550dd23c7780afb5eead6505 SHA1 3855eec6b3fc23652bb113ce4215555e7375566e SHA256 335e6f51c5e22ef8735c5a4c99b21b903f6d5dd32d6e766761c39a421ee651f3
AUX 301-xulrunner-xpctools.diff 550 RMD160 12d370d5473de5c54233a70533cd35e37305ef86 SHA1 e3812ce6a4446b0b9d496a9dd4760d03bf0de449 SHA256 6bf510f7df5a41f47501cbdbcffc46d0c04865e3597dc6a575cd4a9cfae1def4
+AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862ded55d82829 SHA1 d0c194c79993c3c47a8c46726d3f024e044766a0 SHA256 20f558efbf4ed1960b390c353c7eeb94108fcdb8aaf33f1fea6caf44468aeb7c
AUX xulrunner-1.9.2-arm-fixes.patch 587 RMD160 495e8037785a1867fad0c088a4c834df6f02291c SHA1 5f08ef1f65771c2891a067c7baac8a4ef8466deb SHA256 a1b0aef546deecafe64c9ce70b08e7252a3eaf8d84a381a62b5edfaf1f735817
AUX xulrunner-1.9.2-fix-pkgconfig-file.patch 397 RMD160 f1724e2476d21751e59845826dfc76dadd9db048 SHA1 0f70bfb689cba2fc609b6642408c41b0032422bc SHA256 74590a970f96a767c353e5530e40048c3c1ea0f652029eb35e782029c0b45d6e
AUX xulrunner-1.9.2-noalsa-fixup.patch 1031 RMD160 6eae45ee3e29fa47a7b31688cfcbfb594fcdd79b SHA1 845d4962708281bbd0cba45db82335739a50897b SHA256 1c4e017b6a8d81267a9d4b29b10cc4cfe69b090f8f8903a663f25b5e300eddd5
@@ -24,6 +25,6 @@ EBUILD xulrunner-1.9.1.6.ebuild 7948 RMD160 b3bca093dcb0ae36a7d493cb2990d7fe519a
EBUILD xulrunner-1.9.1.8.ebuild 7951 RMD160 235df30f6c383961147c5114ab2bbc39e12aad05 SHA1 5fb4b96ba83ef678ac01faa354d4b67b53149dbd SHA256 d2d1768a7ecf76e310cfec673961605fe9c36c836dc50242541b3a46e3fc2938
EBUILD xulrunner-1.9.2.4.ebuild 7191 RMD160 8633d7a9e174309d378bed99dcce757350a5e031 SHA1 f1da98486f1c78d5cb01da2e5b7174618e9694ea SHA256 9105361d24aec4de8f012180008d848b9672be2dc17fb8bc0762831381558149
EBUILD xulrunner-1.9.2.6.ebuild 7360 RMD160 b755a170bf55899f4a7db7cd2f194aa49728fb22 SHA1 21bd2f0bf9ec6797768596c32c6ed9acff97b4e7 SHA256 3269c7adcbf563917ec1a660ca0f4da3c7f6b437f0e527d21e7645eda0e03369
-EBUILD xulrunner-1.9.2.7.ebuild 7211 RMD160 59924073e4041f9aff59702b053d608397c2bf0c SHA1 bb1262f2bff50bbb2d42d3b56e176b12482be821 SHA256 0d2f6d7633d32d39a5cba3fe5828318ec8ca561918a2be64848dc0f122f9a162
-MISC ChangeLog 44742 RMD160 e92dcc1fb3bd90c7730566b4da913608dbf131e2 SHA1 f0da942999fce67b6e0c19c1825987105b33c76c SHA256 46b28554af4143226da9e3c6f93c4f35e282c72b70f611a0f145d6ee22184d67
+EBUILD xulrunner-1.9.2.7.ebuild 7316 RMD160 6ec06f15af0d7e73cf94b42091132f00fd1e22f8 SHA1 db3f08edbcebf007c37cbffedba00c186150022e SHA256 32180b3a6fd6d2d694dbab43846606de41616e4d7e9c67cbb4bd6b968a7d59a3
+MISC ChangeLog 44913 RMD160 f203f733da036195ad92b01f20b931142dcb47a7 SHA1 5dfff354aecd6e32ecfb6f6cfbfe019b5c2072b3 SHA256 d559275998e811355fc8ca95da1e9223ac94e72b1896e07399229746df416776
MISC metadata.xml 534 RMD160 6f9915565c51559c0e4726fed4e43cffce894306 SHA1 7ababd8846ab59b3ea43ac0153750584aa792055 SHA256 60f561d9e9846e96bfa0d6a9161058986c65dba93879073e7138477b6ce61978
diff --git a/net-libs/xulrunner/files/801-enable-x86_64-tracemonkey.patch b/net-libs/xulrunner/files/801-enable-x86_64-tracemonkey.patch
new file mode 100644
index 000000000000..b72ad76b450e
--- /dev/null
+++ b/net-libs/xulrunner/files/801-enable-x86_64-tracemonkey.patch
@@ -0,0 +1,25 @@
+--- js/src/configure.in.old 2009-11-08 19:50:54.299642792 -0500
++++ js/src/configure.in 2009-11-08 19:57:49.235621814 -0500
+@@ -2465,6 +2465,10 @@
+ ENABLE_JIT=1
+ NANOJIT_ARCH=i386
+ ;;
++x86_64*-*)
++ ENABLE_JIT=1
++ NANOJIT_ARCH=X64
++ ;;
+ arm*-*)
+ ENABLE_JIT=1
+ NANOJIT_ARCH=ARM
+@@ -2488,7 +2492,10 @@
+ i?86-*)
+ AC_DEFINE(AVMPLUS_IA32)
+ ;;
+-
++x86_64*-*)
++ AC_DEFINE(AVMPLUS_AMD64)
++ AC_DEFINE(AVMPLUS_64BIT)
++ ;;
+ arm*-*)
+ AC_DEFINE(AVMPLUS_ARM)
+ ;;
diff --git a/net-libs/xulrunner/xulrunner-1.9.2.7.ebuild b/net-libs/xulrunner/xulrunner-1.9.2.7.ebuild
index 75f83d9ba667..d1c5c3a1ab70 100644
--- a/net-libs/xulrunner/xulrunner-1.9.2.7.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9.2.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.7.ebuild,v 1.2 2010/07/21 11:28:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9.2.7.ebuild,v 1.3 2010/07/21 13:18:52 polynomial-c Exp $
EAPI="2"
WANT_AUTOCONF="2.1"
@@ -73,6 +73,9 @@ src_prepare() {
# ARM fixes, bug 327783
epatch "${FILESDIR}/${PN}-1.9.2-arm-fixes.patch"
+ # Enable tracemonkey for amd64 (bug #315997)
+ epatch "${FILESDIR}/801-enable-x86_64-tracemonkey.patch"
+
# Allow user to apply additional patches without modifing ebuild
epatch_user