[freewrl] fix build

Tom Callaway spot at fedoraproject.org
Wed Jan 9 21:07:04 UTC 2013


commit 235b2c4b315525aff7469a2b31bf2c1a2d0a8be8
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Jan 9 16:09:07 2013 -0500

    fix build

 freewrl-1.22.13-use-JS_NewGlobalObject.patch |   16 ++++++++++++++++
 freewrl.spec                                 |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/freewrl-1.22.13-use-JS_NewGlobalObject.patch b/freewrl-1.22.13-use-JS_NewGlobalObject.patch
new file mode 100644
index 0000000..145fb2b
--- /dev/null
+++ b/freewrl-1.22.13-use-JS_NewGlobalObject.patch
@@ -0,0 +1,16 @@
+diff -up freewrl-1.22.13/src/lib/world_script/JScript.c.NewGlobalObject freewrl-1.22.13/src/lib/world_script/JScript.c
+--- freewrl-1.22.13/src/lib/world_script/JScript.c.NewGlobalObject	2013-01-09 16:06:13.513829513 -0500
++++ freewrl-1.22.13/src/lib/world_script/JScript.c	2013-01-09 16:07:14.463839350 -0500
+@@ -404,10 +404,10 @@ void JSCreateScriptContext(int num) {
+ #endif
+ 	#if JS_VERSION >= 185
+ 	if (num == 0) {
+-		_globalObj = JS_NewCompartmentAndGlobalObject(_context, &p->globalClass, NULL);
++		_globalObj = JS_NewGlobalObject(_context, &p->globalClass, NULL);
+ 	} else {
+ 		JS_SetGlobalObject(_context,ScriptControl[0].glob);
+-		_globalObj = JS_NewGlobalObject(_context,&p->globalClass);
++		_globalObj = JS_NewGlobalObject(_context,&p->globalClass, NULL);
+ 		JS_SetGlobalObject(_context,_globalObj);
+ 	}	
+ 	#else
diff --git a/freewrl.spec b/freewrl.spec
index 2c56c23..3abeec1 100644
--- a/freewrl.spec
+++ b/freewrl.spec
@@ -2,7 +2,7 @@
 
 Name:		freewrl
 Version:	%{basever}.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	X3D / VRML visualization program
 Group:		Applications/Internet
 License:	LGPLv3+
@@ -12,6 +12,7 @@ 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
+Patch3:		freewrl-1.22.13-use-JS_NewGlobalObject.patch
 BuildRequires:	zlib-devel, freetype-devel, fontconfig-devel 
 BuildRequires:	imlib2-devel, nspr-devel, xulrunner-devel
 BuildRequires:	expat-devel, libXxf86vm-devel, libX11-devel, libXext-devel
@@ -75,6 +76,7 @@ browser plugin for Firefox (and other xulrunner compatible browsers).
 %patch0 -p1 -b .xul13
 %patch1 -p1 -b .noJS_FinalizeStub
 %patch2 -p1 -b .noMaybeGC
+%patch3 -p1 -b .NewGlobalObject
 cp %{SOURCE1} .
 # Don't need it.
 rm -rf appleOSX/
@@ -148,6 +150,9 @@ chrpath --delete %{buildroot}%{_libdir}/libFreeWRLEAI.so.*
 %{_libdir}/mozilla/plugins/libFreeWRLplugin.so
 
 %changelog
+* Wed Jan  9 2013 Tom Callaway <spot at fedoraproject.org> - 1.22.13.1-6
+- use JS_NewGlobalObject instead of JS_NewCompartmentAndGlobalObject
+
 * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.22.13.1-5
 - rebuild against new libjpeg
 


More information about the scm-commits mailing list