[freewrl] two args for JS_GetPrototype today

[Tom Callaway]

commit 382c4afdfe010f1c8b404a133abd20450846843c
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri Feb 1 13:18:53 2013 +0100

    two args for JS_GetPrototype today

 freewrl-1.22.1-JS_GetPrototype-two-args.patch |   66 +++++++++++++++++++++++++
 freewrl.spec                                  |    9 +++-
 2 files changed, 74 insertions(+), 1 deletions(-)
---
diff --git a/freewrl-1.22.1-JS_GetPrototype-two-args.patch b/freewrl-1.22.1-JS_GetPrototype-two-args.patch
new file mode 100644
index 0000000..fbcb124
--- /dev/null
+++ b/freewrl-1.22.1-JS_GetPrototype-two-args.patch
@@ -0,0 +1,66 @@
+diff -upa freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c.jsgp freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c
+--- freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c.jsgp	2013-02-01 13:11:29.660314576 +0100
++++ freewrl-1.22.13/src/lib/world_script/jsVRML_SFClasses.c	2013-02-01 13:16:54.821338611 +0100
+@@ -1905,7 +1905,7 @@ SFRotationInverse(JSContext *cx, uint32_
+ 	printf ("start of SFRotationInverse\n");
+ 	#endif
+ 
+-	if ((_proto = JS_GetPrototype(obj)) == NULL) {
++	if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ 		printf( "JS_GetPrototype failed in SFRotationInverse.\n");
+ 		return JS_FALSE;
+ 	}
+@@ -1974,7 +1974,7 @@ SFRotationMultiply(JSContext *cx, uint32
+ 	}
+ 	CHECK_CLASS(cx,_multObj,argv,__FUNCTION__,SFRotationClass)
+ 
+-	if ((_proto = JS_GetPrototype(_multObj)) == NULL) {
++	if ((_proto = JS_GetPrototype(cx, _multObj)) == NULL) {
+ 		printf( "JS_GetPrototype failed in SFRotationMultiply.\n");
+ 		return JS_FALSE;
+ 	}
+@@ -2055,7 +2055,7 @@ SFRotationMultVec(JSContext *cx, uint32_
+ 
+ 	CHECK_CLASS(cx,_multObj,argv,__FUNCTION__,SFVec3fClass)
+ 
+-	if ((_proto = JS_GetPrototype(_multObj)) == NULL) {
++	if ((_proto = JS_GetPrototype(cx, _multObj)) == NULL) {
+ 		printf( "JS_GetPrototype failed in SFRotationMultVec.\n");
+ 		return JS_FALSE;
+ 	}
+@@ -2198,7 +2198,7 @@ SFRotationSlerp(JSContext *cx, uint32_t
+ 	} else if (APPROX(t, 1)) {
+ 		*rval = OBJECT_TO_JSVAL(_destObj);
+ 	} else {
+-		if ((_proto = JS_GetPrototype(_destObj)) == NULL) {
++		if ((_proto = JS_GetPrototype(cx, _destObj)) == NULL) {
+ 			printf( "JS_GetPrototype failed in SFRotationSlerp.\n");
+ 			return JS_FALSE;
+ 		}
+@@ -2770,7 +2770,7 @@ JSBool SFVec2fGeneric( JSContext *cx, JS
+ 
+ 	/* set the return object */
+ 	if (retSFVec2f) {
+-		if ((_proto = JS_GetPrototype(obj)) == NULL) {
++		if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ 			printf( "JS_GetPrototype failed in SFVec2f.\n");
+ 			return JS_FALSE;
+ 		}
+@@ -3331,7 +3331,7 @@ JSBool SFVec3fGeneric( JSContext *cx, JS
+ 		#ifdef JSVRMLCLASSESVERBOSE
+ 		printf ("returning SFVec3f\n");
+ 		#endif
+-		if ((_proto = JS_GetPrototype(obj)) == NULL) {
++		if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ 			printf( "JS_GetPrototype failed in SFVec3f.\n");
+ 			return JS_FALSE;
+ 		}
+@@ -3983,7 +3983,7 @@ JSBool SFVec3dGeneric( JSContext *cx, JS
+ 		#ifdef JSVRMLCLASSESVERBOSE
+ 		printf ("returning SFVec3d\n");
+ 		#endif
+-		if ((_proto = JS_GetPrototype(obj)) == NULL) {
++		if ((_proto = JS_GetPrototype(cx, obj)) == NULL) {
+ 			printf( "JS_GetPrototype failed in SFVec3d.\n");
+ 			return JS_FALSE;
+ 		}
diff --git a/freewrl.spec b/freewrl.spec
index 3abeec1..eaefae0 100644
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -2,7 +2,7 @@
 
 Name:		freewrl
 Version:	%{basever}.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	X3D / VRML visualization program
 Group:		Applications/Internet
 License:	LGPLv3+
@@ -13,6 +13,9 @@ Patch0:		freewrl-1.22.13.1-xul13.patch
 Patch1:		freewrl-1.22.13-noJS_FinalizeStub.patch
 Patch2:		freewrl-1.22.13.1-noMaybeGC.patch
 Patch3:		freewrl-1.22.13-use-JS_NewGlobalObject.patch
+# Sometimes JS_GetPrototype has one arg, sometimes two.
+# What day is it today?
+Patch4:		freewrl-1.22.1-JS_GetPrototype-two-args.patch
 BuildRequires:	zlib-devel, freetype-devel, fontconfig-devel 
 BuildRequires:	imlib2-devel, nspr-devel, xulrunner-devel
 BuildRequires:	expat-devel, libXxf86vm-devel, libX11-devel, libXext-devel
@@ -77,6 +80,7 @@ browser plugin for Firefox (and other xulrunner compatible browsers).
 %patch1 -p1 -b .noJS_FinalizeStub
 %patch2 -p1 -b .noMaybeGC
 %patch3 -p1 -b .NewGlobalObject
+%patch4 -p1 -b .jsgp
 cp %{SOURCE1} .
 # Don't need it.
 rm -rf appleOSX/
@@ -150,6 +154,9 @@ chrpath --delete %{buildroot}%{_libdir}/libFreeWRLEAI.so.*
 %{_libdir}/mozilla/plugins/libFreeWRLplugin.so
 
 %changelog
+* Fri Feb  1 2013 Tom Callaway <spot at fedoraproject.org> - 1.22.13.1-7
+- two args for JS_GetPrototype today
+
 * Wed Jan  9 2013 Tom Callaway <spot at fedoraproject.org> - 1.22.13.1-6
 - use JS_NewGlobalObject instead of JS_NewCompartmentAndGlobalObject