diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2011-06-12 12:11:05 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2011-06-12 12:11:05 +0000 |
| commit | 0c88ab293066e0454d2eab19693b4014b65e8fc6 (patch) | |
| tree | 38e3b4ca693a895946c0c332d58ee7d653fcedeb | |
| parent | alpha/ia64/s390/sh/sparc stable wrt #369403 (diff) | |
| download | gentoo-2-0c88ab293066e0454d2eab19693b4014b65e8fc6.tar.gz gentoo-2-0c88ab293066e0454d2eab19693b4014b65e8fc6.tar.bz2 gentoo-2-0c88ab293066e0454d2eab19693b4014b65e8fc6.zip | |
Add support for spidermonkey-1.9*
(Portage version: 2.1.10.2/cvs/Linux x86_64)
| -rw-r--r-- | www-client/elinks/ChangeLog | 7 | ||||
| -rw-r--r-- | www-client/elinks/elinks-0.12_pre5-r1.ebuild | 8 | ||||
| -rw-r--r-- | www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch | 12 |
3 files changed, 24 insertions, 3 deletions
diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog index 3f5a0ab081da..849aa7793289 100644 --- a/www-client/elinks/ChangeLog +++ b/www-client/elinks/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-client/elinks # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.137 2011/01/31 16:53:59 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.138 2011/06/12 12:11:05 spock Exp $ + + 12 Jun 2011; Michał Januszewski <spock@gentoo.org> + elinks-0.12_pre5-r1.ebuild, + +files/elinks-0.12pre5-spidermonkey-callback.patch: + Add support for spidermonkey-1.9* 31 Jan 2011; Jeremy Olexa <darkside@gentoo.org> elinks-0.12_pre5-r1.ebuild: diff --git a/www-client/elinks/elinks-0.12_pre5-r1.ebuild b/www-client/elinks/elinks-0.12_pre5-r1.ebuild index 7bf84a30e860..02a6a13660b7 100644 --- a/www-client/elinks/elinks-0.12_pre5-r1.ebuild +++ b/www-client/elinks/elinks-0.12_pre5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r1.ebuild,v 1.8 2011/01/31 16:53:59 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r1.ebuild,v 1.9 2011/06/12 12:11:05 spock Exp $ EAPI="3" @@ -32,7 +32,7 @@ DEPEND="dev-libs/boehm-gc perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) - javascript? ( <=dev-lang/spidermonkey-1.9 )" + javascript? ( <dev-lang/spidermonkey-2.0 )" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}" @@ -54,6 +54,10 @@ src_prepare() { epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch epatch "${FILESDIR}"/elinks-0.12_pre5-compilation-fix.patch + if use javascript && has_version ">=dev-lang/spidermonkey-1.9"; then + epatch "${FILESDIR}"/elinks-0.12pre5-spidermonkey-callback.patch + fi + sed -i -e 's/-Werror//' configure* eautoreconf } diff --git a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch new file mode 100644 index 000000000000..b48ddaeecc47 --- /dev/null +++ b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch @@ -0,0 +1,12 @@ +diff -Naurp elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c elinks-0.12pre5/src/ecmascript/spidermonkey.c +--- elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c 2011-06-12 01:03:02.427000686 +0200 ++++ elinks-0.12pre5/src/ecmascript/spidermonkey.c 2011-06-12 01:03:31.368000736 +0200 +@@ -130,7 +130,7 @@ setup_safeguard(struct ecmascript_interp + JSContext *ctx) + { + interpreter->exec_start = time(NULL); +- JS_SetBranchCallback(ctx, safeguard); ++ JS_SetOperationCallback(ctx, safeguard); + } + + |