[freewrl] fix FTBFS

[Tom Callaway]

commit 8d79516232551889305a6b07e832ce752f2e175f
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Jul 31 23:56:59 2012 -0400

    fix FTBFS

 freewrl-1.22.13-noJS_FinalizeStub.patch |   26 ++++++++++++++++++++++++++
 freewrl-1.22.13.1-noMaybeGC.patch       |   12 ++++++++++++
 freewrl.spec                            |    9 ++++++++-
 3 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/freewrl-1.22.13-noJS_FinalizeStub.patch b/freewrl-1.22.13-noJS_FinalizeStub.patch
new file mode 100644
index 0000000..d46b849
--- /dev/null
+++ b/freewrl-1.22.13-noJS_FinalizeStub.patch
@@ -0,0 +1,26 @@
+diff -up freewrl-1.22.13/src/lib/world_script/JScript.c.noJS_FinalizeStub freewrl-1.22.13/src/lib/world_script/JScript.c
+--- freewrl-1.22.13/src/lib/world_script/JScript.c.noJS_FinalizeStub	2011-07-26 17:34:36.000000000 -0400
++++ freewrl-1.22.13/src/lib/world_script/JScript.c	2012-07-31 23:35:42.083424821 -0400
+@@ -75,8 +75,7 @@ static JSClass staticGlobalClass = {
+ 	JS_PropertyStub,
+ 	JS_EnumerateStub,
+ 	globalResolve,
+-	JS_ConvertStub,
+-	JS_FinalizeStub
++	JS_ConvertStub
+ };
+ 
+ 
+diff -up freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c.noJS_FinalizeStub freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c
+--- freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c.noJS_FinalizeStub	2012-07-31 23:38:05.001434217 -0400
++++ freewrl-1.22.13/src/lib/world_script/jsVRMLBrowser.c	2012-07-31 23:38:23.888435465 -0400
+@@ -80,8 +80,7 @@ static JSClass Browser = {
+ #endif
+     JS_EnumerateStub,
+     JS_ResolveStub,
+-    JS_ConvertStub,
+-    JS_FinalizeStub
++    JS_ConvertStub
+ };
+ 
+ static JSBool doVRMLRoute(JSContext *context, JSObject *obj, unsigned argc, jsval *argv, const char *browserFunc); 
diff --git a/freewrl-1.22.13.1-noMaybeGC.patch b/freewrl-1.22.13.1-noMaybeGC.patch
new file mode 100644
index 0000000..3b71d29
--- /dev/null
+++ b/freewrl-1.22.13.1-noMaybeGC.patch
@@ -0,0 +1,12 @@
+diff -up freewrl-1.22.13/src/lib/world_script/JScript.c.noMaybeGC freewrl-1.22.13/src/lib/world_script/JScript.c
+--- freewrl-1.22.13/src/lib/world_script/JScript.c.noMaybeGC	2012-07-31 23:54:37.284499505 -0400
++++ freewrl-1.22.13/src/lib/world_script/JScript.c	2012-07-31 23:54:43.435499873 -0400
+@@ -263,7 +263,7 @@ void kill_javascript(void) {
+ 					JS_RemoveObjectRoot(ScriptControl[i].cx,ScriptControl[i].eventsProcessed);
+ 				}
+ #endif
+-				JS_DestroyContextMaybeGC(ScriptControl[i].cx);
++				JS_DestroyContext(ScriptControl[i].cx);
+ 			}
+ 		}
+ 
diff --git a/freewrl.spec b/freewrl.spec
index 6bce7de..f953760 100644
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -2,7 +2,7 @@
 
 Name:		freewrl
 Version:	%{basever}.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	X3D / VRML visualization program
 Group:		Applications/Internet
 License:	LGPLv3+
@@ -10,6 +10,8 @@ URL:		http://freewrl.sourceforge.net
 Source0:	http://sourceforge.net/projects/freewrl/files/freewrl-linux/1.22/%{name}-%{version}.tar.bz2
 Source1:	README.FreeWRL.java
 Patch0:		freewrl-1.22.13.1-xul13.patch
+Patch1:		freewrl-1.22.13-noJS_FinalizeStub.patch
+Patch2:		freewrl-1.22.13.1-noMaybeGC.patch
 BuildRequires:	zlib-devel, freetype-devel, fontconfig-devel 
 BuildRequires:	imlib2-devel, nspr-devel, xulrunner-devel
 BuildRequires:	expat-devel, libXxf86vm-devel, libX11-devel, libXext-devel
@@ -71,6 +73,8 @@ browser plugin for Firefox (and other xulrunner compatible browsers).
 %prep
 %setup -q -n %{name}-%{basever}
 %patch0 -p1 -b .xul13
+%patch1 -p1 -b .noJS_FinalizeStub
+%patch2 -p1 -b .noMaybeGC
 cp %{SOURCE1} .
 # Don't need it.
 rm -rf appleOSX/
@@ -144,6 +148,9 @@ chrpath --delete %{buildroot}%{_libdir}/libFreeWRLEAI.so.*
 %{_libdir}/mozilla/plugins/libFreeWRLplugin.so
 
 %changelog
+* Tue Jul 31 2012 Tom Callaway <spot at fedoraproject.org> - 1.22.13.1-3
+- fix build, patch out deprecated JS_FinalizeStub, JS_DestroyContextMaybeGC
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.22.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild