rpms/openvrml/devel openvrml.spec, 1.88, 1.89 xulrunner-1.9.2.patch, 1.1, 1.2

[Braden McDaniel]

Author: braden

Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22426

Modified Files:
	openvrml.spec xulrunner-1.9.2.patch 
Log Message:
Fixes for xulrunner-1.9.2 compatibility patch.


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- openvrml.spec	15 Jan 2010 05:29:19 -0000	1.88
+++ openvrml.spec	15 Jan 2010 15:58:15 -0000	1.89
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.18.3
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        VRML/X3D player and runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -237,7 +237,10 @@ CXXFLAGS="%optflags -fvisibility=hidden 
 %doc %{_datadir}/doc/libopenvrml-%{version}/manual
 
 %changelog
-* Thu Jan 15 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.3-14
+* Fri Jan 15 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.3-15
+- Fixes for xulrunner-1.9.2 compatibility patch.
+
+* Fri Jan 15 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.3-14
 - Don't patch with -p1.
 
 * Thu Jan 14 2010  Braden McDaniel  <braden at endoframe.com> - 0.18.3-13

xulrunner-1.9.2.patch:
 openvrml.cpp |   57 ++++++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

Index: xulrunner-1.9.2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/xulrunner-1.9.2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xulrunner-1.9.2.patch	14 Jan 2010 23:38:58 -0000	1.1
+++ xulrunner-1.9.2.patch	15 Jan 2010 15:58:15 -0000	1.2
@@ -20,6 +20,26 @@ Index: src/mozilla-plugin/openvrml.cpp
      err = NPN_GetValue(0, NPNVSupportsXEmbedBool, &supportsXEmbed);
  
      if (err != NPERR_NO_ERROR || !supportsXEmbed) {
+@@ -445,8 +445,8 @@
+  */
+ NPError NPP_New(const NPMIMEType,
+                 const NPP instance,
+-                uint16 /* mode */,
+-                int16 /* argc */,
++                uint16_t /* mode */,
++                int16_t /* argc */,
+                 char * /* argn */[],
+                 char * /* argv */[],
+                 NPSavedData *)
+@@ -536,7 +536,7 @@
+                       const NPMIMEType type,
+                       NPStream * const stream,
+                       NPBool /* seekable */,
+-                      uint16 * const stype)
++                      uint16_t * const stype)
+ {
+     if (!instance || !instance->pdata) { return NPERR_INVALID_INSTANCE_ERROR; }
+ 
 @@ -572,23 +572,23 @@
   */
  
@@ -51,6 +71,15 @@ Index: src/mozilla-plugin/openvrml.cpp
  {
      if (!instance || !instance->pdata) { return 0; }
  
+@@ -654,7 +654,7 @@
+     }
+ }
+ 
+-int16 NPP_HandleEvent(NPP, void * /* event */)
++int16_t NPP_HandleEvent(NPP, void * /* event */)
+ {
+     return true;
+ }
 @@ -665,11 +665,6 @@
                     void * /* notifyData */)
  {}
@@ -117,8 +146,15 @@ Index: src/mozilla-plugin/openvrml.cpp
  {
      return mozillaFuncs.memflush(size);
  }
-@@ -824,9 +819,9 @@
-     return static_cast<JRIEnv *>(mozillaFuncs.getJavaEnv());
+@@ -819,14 +814,14 @@
+     mozillaFuncs.reloadplugins(reloadPages);
+ }
+ 
+-JRIEnv * NPN_GetJavaEnv()
++void * NPN_GetJavaEnv()
+ {
+-    return static_cast<JRIEnv *>(mozillaFuncs.getJavaEnv());
++    return mozillaFuncs.getJavaEnv();
  }
  
 -jref NPN_GetJavaPeer(NPP instance)