fixed some spidermonkey-1.8.5 jsval usage errors, added support for spidermonkey-1.8.7

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 144 insertions, 9 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 2ad80487254f..9c486ffb0777 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/elinks
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.142 2012/04/16 11:02:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.143 2012/06/28 17:05:31 axs Exp $
+
+  28 Jun 2012; Ian Stakenvicius <axs@gentoo.org> elinks-0.12_pre5-r2.ebuild,
+  +files/elinks-0.12_pre5-sm185-jsval-fixes.patch:
+  fixed some spidermonkey-1.8.5 jsval usage errors, added support for
+  spidermonkey-1.8.7
 
 *elinks-0.12_pre5-r2 (16 Apr 2012)
 
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 8cd8bd5910be..8dce9670cdab 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -8,19 +8,20 @@ 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.12_pre5-sm185-jsval-fixes.patch 3921 RMD160 3926023d28e2442dc0451e6590b234bb07dc02e1 SHA1 b69a66f85af8f7fc5eb01839afffaab81b85230b SHA256 d59f9e97f5d495803e0ac35726bf42592a8f726c2367fbc08b8fe9de79de4a2f
 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.12_pre5-js185-patches.tar.bz2 13820 RMD160 14936822390e22e95bf2fc8d60fd16fa9c484629 SHA1 95658432dc826e6fa618fe23cf250a50aeff2dd9 SHA256 64f7c4a657128983d054bd0d2027e11facd42fcc86bd8dfdf5b27ffbacbd54c8
 DIST elinks-0.12pre5.tar.bz2 2783523 RMD160 4983083f21928da78f937b4dea09f8937c3a9cb9 SHA1 15fb38fa938a0eec9d5f22fdd538a6785e2854af SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2
 EBUILD elinks-0.11.7.ebuild 4358 RMD160 afd06665d1a437205efb1452ae4a0a00c2ff5e78 SHA1 484b2b315d846c71f4f1f5f1ac4363199104c62a SHA256 2824d95dc5f12044a82a944c506dea477e1db14ed3d370062c23284b8e6a4bd4
-EBUILD elinks-0.12_pre5-r2.ebuild 4958 RMD160 5068bc2d2328336dfdb33946b9717f4d92ab1f8b SHA1 7643825318727fa3bae799d618b33bd40ccaea9b SHA256 713094c75cece4012e71d40852e7caa2caad9304bfea6de89b9299dbbe0b67d2
-MISC ChangeLog 27362 RMD160 c896bdd08ab4c909da9a14ebcd69127d507940b6 SHA1 a845444cc7b26c44ae5fd7bb182a4bc87fdda7c5 SHA256 d75c12fdfcc6588d61bcbb29da8eb1a7d91fc3f5537cd1707ce630f2f8ce8f36
+EBUILD elinks-0.12_pre5-r2.ebuild 5172 RMD160 7dd46f0ee157342efc879f06d2e07c55139e4680 SHA1 ae8fec2e2a13a12de23eeae2e47b11560c77649c SHA256 2e7806590a2177c066481c7bb766a9fdf83dda5148c4dad85f7ff3c1414c9ed7
+MISC ChangeLog 27580 RMD160 690d12cea62160a8bc1116ecf4e69a6c5b4a8e06 SHA1 d7dd368e33a0db892d6b72fbe36b1d542a862c73 SHA256 562c77fb9d1ce5fb8d0dc5fcaafa61e71e3dd8bba12141d8a8c230a31dab32f4
 MISC metadata.xml 497 RMD160 3b538ecd57ee0fb1e4ca34240313abc7288e0f35 SHA1 6025d6b01f0ecbd3e4023552ae16f9f483f3e882 SHA256 46c078d1cc7e933e17fc97f3fba58c8a6de73e65dc240cf96b18a7e5f9912b31
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+L/GcACgkQCaWpQKGI+9Q/uwCdFseQUYPl144YieQ4tzOWNOv2
-xsUAn0ZC6lB9sTDmIick0kUaQqn8rnNv
-=bv3L
+iF4EAREIAAYFAk/sjvkACgkQ2ugaI38ACPBeMgEAuOPuFLEC6Mjh3iVy+SUT3z+7
++z48Na3mWcVsEO9kTmYBAJvrJnHE3NXNmqUJriJRdbWiZBi1g0oZhd1b873UxrTB
+=R3FT
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.12_pre5-r2.ebuild b/www-client/elinks/elinks-0.12_pre5-r2.ebuild
index 94301588e76a..4045468dcf11 100644
--- a/www-client/elinks/elinks-0.12_pre5-r2.ebuild
+++ b/www-client/elinks/elinks-0.12_pre5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/04/16 11:02:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.12_pre5-r2.ebuild,v 1.2 2012/06/28 17:05:31 axs Exp $
 
 EAPI=4
 inherit eutils autotools flag-o-matic
@@ -59,6 +59,11 @@ src_prepare() {
 			epatch "${WORKDIR}"/patches/${P}-js185-1-heartbeat.patch
 			epatch "${WORKDIR}"/patches/${P}-js185-2-up.patch
 			epatch "${WORKDIR}"/patches/${P}-js185-3-histback.patch
+			epatch "${FILESDIR}"/${P}-sm185-jsval-fixes.patch
+			# expand lib check to also match mozjs187
+			if has_version ">=dev-lang/spidermonkey-1.8.7"; then
+				sed -i 's:mozjs185:mozjs187 mozjs185:' configure.in
+			fi
 		else
 			epatch "${FILESDIR}"/${MY_P}-spidermonkey-callback.patch
 		fi
diff --git a/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
new file mode 100644
index 000000000000..ee2e5e8d633f
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.12_pre5-sm185-jsval-fixes.patch
@@ -0,0 +1,124 @@
+--- a/src/scripting/smjs/action_object.c	2012-06-28 11:46:58.000000000 -0400
++++ b/src/scripting/smjs/action_object.c	2012-06-28 11:52:42.000000000 -0400
+@@ -50,7 +50,7 @@
+ 	assert(smjs_ctx);
+ 	if_assert_failed return JS_FALSE;
+ 
+-	value = JS_FALSE;
++	value = JSVAL_FALSE;
+ 
+ 	if (JS_TRUE != JS_ValueToObject(ctx, argv[-2], &fn_obj)) {
+ 		JS_SET_RVAL(ctx, rval, value);
+@@ -76,7 +76,7 @@
+ 
+ 	do_action(hop->ses, hop->action_id, 1);
+ 
+-	value = JS_TRUE;
++	value = JSVAL_TRUE;
+ 	JS_SET_RVAL(ctx, rval, value);
+ 
+ 	return JS_TRUE;
+--- a/src/scripting/smjs/bookmarks.c	2012-06-28 11:57:40.000000000 -0400
++++ b/src/scripting/smjs/bookmarks.c	2012-06-28 12:08:20.000000000 -0400
+@@ -250,11 +250,20 @@
+ 
+ /* @bookmark_folder_class.getProperty */
+ static JSBool
++#if JS_VERSION >= 185
++bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
+ bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#endif
+ {
+ 	struct bookmark *bookmark;
+ 	struct bookmark *folder;
+ 	unsigned char *title = NULL;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail
+--- a/src/scripting/smjs/elinks_object.c	2012-06-28 12:11:15.000000000 -0400
++++ b/src/scripting/smjs/elinks_object.c	2012-06-28 12:14:50.000000000 -0400
+@@ -185,7 +185,7 @@
+ 	                               method, rval))
+ 		return JS_FALSE;
+ 
+-	if (JSVAL_VOID == *rval)
++	if (JSVAL_IS_VOID(*rval))
+ 		return JS_FALSE;
+ 
+ 	return JS_CallFunctionValue(smjs_ctx, smjs_elinks_object,
+--- a/src/scripting/smjs/globhist.c	2012-06-28 12:20:25.000000000 -0400
++++ b/src/scripting/smjs/globhist.c	2012-06-28 12:20:15.000000000 -0400
+@@ -201,11 +201,20 @@
+ 
+ /* @smjs_globhist_class.getProperty */
+ static JSBool
+-smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#if JS_VERSION >= 185
++smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
++smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
++#endif
+ {
+ 	JSObject *jsobj;
+ 	unsigned char *uri_string;
+ 	struct global_history_item *history_item;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	uri_string = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
+ 	if (!uri_string) goto ret_null;
+--- a/src/scripting/smjs/keybinding.c	2012-06-28 12:21:39.000000000 -0400
++++ b/src/scripting/smjs/keybinding.c.new	2012-06-28 12:48:00.000000000 -0400
+@@ -17,11 +17,20 @@
+ 
+ /* @keymap_class.getProperty */
+ static JSBool
+-keymap_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
++#if JS_VERSION >= 185
++keymap_get_property(JSContext *ctx, JSObject *obj, jsid iid, jsval *vp)
++#else
++keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
++#endif
+ {
+ 	unsigned char *action_str;
+ 	const unsigned char *keystroke_str;
+ 	int *data;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail
+@@ -70,11 +79,20 @@
+ 
+ /* @keymap_class.setProperty */
+ static JSBool
+-keymap_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
++#if JS_VERSION >= 185
++keymap_set_property(JSContext *ctx, JSObject *obj, jsid iid, JSBool strict, jsval *vp)
++#else
++keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, JSBool strict, jsval *vp)
++#endif
+ {
+ 	int *data;
+ 	unsigned char *keymap_str;
+ 	const unsigned char *keystroke_str;
++#if JS_VERSION >= 185
++	jsval id;
++	if (!JS_IdToValue(ctx,iid,&id))
++		return JS_FALSE;
++#endif
+ 
+ 	/* This can be called if @obj if not itself an instance of the
+ 	 * appropriate class but has one in its prototype chain.  Fail