summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-client')
-rw-r--r--www-client/elinks/ChangeLog7
-rw-r--r--www-client/elinks/Manifest15
-rw-r--r--www-client/elinks/elinks-0.12_pre5-r1.ebuild8
-rw-r--r--www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch12
4 files changed, 37 insertions, 5 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/Manifest b/www-client/elinks/Manifest
index 1cee88d59945..9bb9e4b5536f 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX elinks-0.10.1-utf_8_io-default.patch 456 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b SHA1 c9141e89ba62da5277d0df42e73f4eb258e23552 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010
AUX elinks-0.10.4.conf-syscharset.diff 2580 RMD160 3bb9037e75adc225915a4a6b41afff0ef09f1eba SHA1 fe28f5ae8f290f15f1165273f22e9417f5648e40 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c
AUX elinks-0.11.2-lua-5.1.patch 538 RMD160 7bd83ed15ea14cc41b909c4022eee082a47fb706 SHA1 0183f106db71725ccb0f2b83746373ca9e5f0522 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4
@@ -5,11 +8,19 @@ AUX elinks-0.11.2-lua-5.patch 2125 RMD160 be94e085a7b231dad1681566c533699b2a6d27
AUX elinks-0.11.3-lua-5.patch 1841 RMD160 61ef22891e59893542326df7803c63ac81117622 SHA1 17682210d407b3efb47bbab9b47463b937d6bffe SHA256 f04d11e01824fb2cf4387b87cd531d64ad280d21e9bcb57e461ace56419d1220
AUX elinks-0.11.5-makefile.patch 1109 RMD160 7d20513b6922f895b4e4050a37550706500952c7 SHA1 4edd6e791ac08f37ee933652ded7049e04e3b6c2 SHA256 5b37be9328b80b9a995de94cf0a053ad63d43a2e0550df6e0c5a4cdc94276e1f
AUX elinks-0.12_pre5-compilation-fix.patch 464 RMD160 afe5e31db6a7ed454052e8f0220e3a5c35aca0e1 SHA1 58a69b5b48f1699451e7a508540b14962888b4d8 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e
+AUX elinks-0.12pre5-spidermonkey-callback.patch 513 RMD160 50dc290e366e92b3c6235571e5772fc80fdf3e60 SHA1 50bedb0a965db8f455110d75ae24cb857c55d00b SHA256 14b65ba92e8693105945d20de6e8f07ec946f17fbbf5248b4f8c431a92b88982
DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
DIST elinks-0.11.7.tar.bz2 2467915 RMD160 2e6e863d08f9accb71892ba6f236f795c83cba9c SHA1 d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54 SHA256 456db6f704c591b1298b0cd80105f459ff8a1fc07a0ec1156a36c4da6f898979
DIST elinks-0.12pre5.tar.bz2 2783523 RMD160 4983083f21928da78f937b4dea09f8937c3a9cb9 SHA1 15fb38fa938a0eec9d5f22fdd538a6785e2854af SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2
EBUILD elinks-0.11.7.ebuild 4348 RMD160 2fcd7fe16f2c21605de0820ccce181e4d54d4398 SHA1 b805a8cdfc90f83440c47358d2bdc104ae0403b2 SHA256 81f71324cba4952352484dd71d31a2436f2fb69ff090b9ea2ac3450a45c5b937
-EBUILD elinks-0.12_pre5-r1.ebuild 4543 RMD160 7841e2d008ffe6b7097d44e32bc353a9bbe79334 SHA1 eed489ea873096b2cf96b0b9068f615397604079 SHA256 08e409ee8a6448d2c73ce5ad61ca6202b2616e0d9fb921ff1b49a15de3f1ca7b
+EBUILD elinks-0.12_pre5-r1.ebuild 4681 RMD160 1263e668cddcddc539fe4e35bde3c42b08c00e6a SHA1 c6e7fb913c8d7dba9abe8fe282dd7d70f82d7d1b SHA256 2ec57d04c52f000622ebc5ce6ac6c668f25330910e345279b19cb7150e2cfa93
EBUILD elinks-0.12_pre5.ebuild 4384 RMD160 ea361e801daf54fd49a3585900a92eb30b76493d SHA1 4302c08c7f04c7eec9a7b2ecd2818f708f044285 SHA256 8c617505804af74ca2d96d5a0f13954dea87a698703d80d7894c95039d06791c
-MISC ChangeLog 26536 RMD160 7f8892f04f3320f26c090799bc3f2ff5cd6705cc SHA1 1e3160f0ef61ae73528f17befbfa89db0e818164 SHA256 3b5d307481cca204ed4401f15444c073ad6b8a2504c19ed96294bbab9dc6f466
+MISC ChangeLog 26708 RMD160 8f6d348a1bfe3973da50c01ad0f2c9ea3b4d3486 SHA1 889730c1e2c24e8b027d5e1582d24e01c3eedecd SHA256 98f6f6cd077242b0fd5021eaf32876f6ea85382ff4f4eb5fddfa98797a992ec2
MISC metadata.xml 539 RMD160 a8e2177168d6c229cb25da446572b8af3a636eaa SHA1 f49389e97de1e05ebffad13baa4f5212b44681ff SHA256 08733a76de608d4d9a4139ce6e9c1c9f23f5c1fea86abdce8e369b1bdc6bf0ad
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk30rOgACgkQchej4aZK9/eedACfWMz1vVgSg7SyltnbyyyyP3iY
+GXAAnR07W1Cxuv18ScbaXpAQP/KDx5zg
+=vOM8
+-----END PGP SIGNATURE-----
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);
+ }
+
+