rpms/openvrml/devel npfunctions.patch, 1.4, 1.5 openvrml.spec, 1.59, 1.60

[Braden McDaniel]

Author: braden

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

Modified Files:
	npfunctions.patch openvrml.spec 
Log Message:
Define OJI for the Gecko plug-in.

npfunctions.patch:

Index: npfunctions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/npfunctions.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- npfunctions.patch	28 Feb 2009 06:08:20 -0000	1.4
+++ npfunctions.patch	28 Feb 2009 06:28:47 -0000	1.5
@@ -1,7 +1,7 @@
 diff -Naur openvrml-0.17.10/mozilla-plugin/src/openvrml.cpp openvrml-0.17.10-npfunctions/mozilla-plugin/src/openvrml.cpp
 --- openvrml-0.17.10/mozilla-plugin/src/openvrml.cpp	2008-10-26 03:44:28.000000000 -0400
-+++ openvrml-0.17.10-npfunctions/mozilla-plugin/src/openvrml.cpp	2009-02-28 01:03:19.000000000 -0500
-@@ -31,7 +31,10 @@
++++ openvrml-0.17.10-npfunctions/mozilla-plugin/src/openvrml.cpp	2009-02-28 01:24:26.000000000 -0500
+@@ -31,7 +31,13 @@
  # include <boost/noncopyable.hpp>
  # include <boost/ref.hpp>
  # include <boost/scoped_ptr.hpp>
@@ -9,11 +9,14 @@
 +# ifndef XP_UNIX
 +#   define XP_UNIX
 +# endif
++# ifndef OJI
++#   define OJI
++# endif
 +# include <npfunctions.h>
  # if defined MOZ_X11
  #   include <dbus/dbus-glib-bindings.h>
  # else
-@@ -121,7 +124,7 @@
+@@ -121,7 +127,7 @@
  
          NPError new_stream(NPMIMEType type, NPStream * stream);
          NPError destroy_stream(NPStream * stream);
@@ -22,7 +25,7 @@
  
          //
          // Scripting API method implementations.
-@@ -337,11 +340,11 @@
+@@ -337,11 +343,8 @@
      //
      // Make sure the browser supports XEmbed plug-ins.
      //
@@ -32,14 +35,11 @@
 -                               NPNVSupportsXEmbedBool,
 -                               &supportsXEmbed);
 +    NPBool supportsXEmbed = false;
-+    err = NPN_GetValue(mozillaFuncs.getvalue,
-+                       0,
-+                       NPNVSupportsXEmbedBool,
-+                       &supportsXEmbed);
++    err = NPN_GetValue(0, NPNVSupportsXEmbedBool, &supportsXEmbed);
  
      if (err != NPERR_NO_ERROR || !supportsXEmbed) {
          return NPERR_INCOMPATIBLE_VERSION_ERROR;
-@@ -351,10 +354,10 @@
+@@ -351,10 +354,7 @@
      // Make sure the browser tookit is Gtk2.
      //
      NPNToolkitType toolkit = NPNToolkitType();
@@ -47,14 +47,11 @@
 -                               0,
 -                               NPNVToolkit,
 -                               &toolkit);
-+    err = NPN_GetValue(mozillaFuncs.getvalue,
-+                       0,
-+                       NPNVToolkit,
-+                       &toolkit);
++    err = NPN_GetValue(0, NPNVToolkit, &toolkit);
  
      if (err != NPERR_NO_ERROR || toolkit != NPNVGtk2) {
          return NPERR_INCOMPATIBLE_VERSION_ERROR;
-@@ -449,8 +452,8 @@
+@@ -449,8 +449,8 @@
   */
  NPError NPP_New(const NPMIMEType,
                  const NPP instance,
@@ -65,7 +62,7 @@
                  char * /* argn */[],
                  char * /* argv */[],
                  NPSavedData *)
-@@ -540,7 +543,7 @@
+@@ -540,7 +540,7 @@
                        const NPMIMEType type,
                        NPStream * const stream,
                        NPBool /* seekable */,
@@ -74,7 +71,7 @@
  {
      if (!instance || !instance->pdata) { return NPERR_INVALID_INSTANCE_ERROR; }
  
-@@ -576,22 +579,22 @@
+@@ -576,22 +576,22 @@
   */
  
  namespace {
@@ -102,7 +99,7 @@
                  void * const buffer)
  {
      if (!instance || !instance->pdata) { return 0; }
-@@ -657,7 +660,7 @@
+@@ -657,7 +657,7 @@
      }
  }
  
@@ -111,7 +108,7 @@
  {
      return true;
  }
-@@ -684,7 +687,7 @@
+@@ -684,7 +684,7 @@
  
      switch (variable) {
      case NPPVpluginNeedsXEmbed:
@@ -120,7 +117,7 @@
          break;
      case NPPVpluginScriptableNPObject:
          assert(npp->pdata);
-@@ -703,307 +706,6 @@
+@@ -703,307 +703,6 @@
      return NPERR_NO_ERROR;
  }
  
@@ -428,7 +425,7 @@
  namespace {
  
      boost::scoped_ptr<const script_callback_map> script_callback_map::instance_;
-@@ -1259,9 +961,9 @@
+@@ -1259,9 +958,9 @@
          return NPERR_NO_ERROR;
      }
  


Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- openvrml.spec	28 Feb 2009 06:08:20 -0000	1.59
+++ openvrml.spec	28 Feb 2009 06:28:48 -0000	1.60
@@ -1,7 +1,7 @@
 # -*- rpm-spec -*-
 Name:           openvrml
 Version:        0.17.10
-Release:        7.0%{?dist}
+Release:        8.0%{?dist}
 Summary:        VRML/X3D runtime library
 License:        LGPLv3+
 Group:          System Environment/Libraries
@@ -171,6 +171,9 @@
 
 
 %changelog
+* Sat Feb 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.17.10-8.0
+- Define OJI for the Gecko plug-in.
+
 * Sat Feb 28 2009  Braden McDaniel  <braden at endoframe.com> - 0.17.10-7.0
 - Looks like Gecko now provides the NPN_* entry points like the old Netscape
   did.