rpms/openvrml/devel npfunctions.patch, 1.2, 1.3 openvrml.spec, 1.57, 1.58
Braden McDaniel
braden at fedoraproject.org
Sat Feb 28 05:38:32 UTC 2009
Author: braden
Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26192
Modified Files:
npfunctions.patch openvrml.spec
Log Message:
Define XP_UNIX and use new integer type names in the Gecko plug-in.
npfunctions.patch:
Index: npfunctions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/npfunctions.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- npfunctions.patch 28 Feb 2009 02:55:42 -0000 1.2
+++ npfunctions.patch 28 Feb 2009 05:38:31 -0000 1.3
@@ -1,13 +1,139 @@
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-27 21:51:35.000000000 -0500
-@@ -31,7 +31,8 @@
++++ openvrml-0.17.10-npfunctions/mozilla-plugin/src/openvrml.cpp 2009-02-28 00:32:36.000000000 -0500
+@@ -31,7 +31,10 @@
# include <boost/noncopyable.hpp>
# include <boost/ref.hpp>
# include <boost/scoped_ptr.hpp>
-# include <npupp.h>
-+# include <npapi.h>
++# ifndef XP_UNIX
++# define XP_UNIX
++# endif
+# include <npfunctions.h>
# if defined MOZ_X11
# include <dbus/dbus-glib-bindings.h>
# else
+@@ -121,7 +124,7 @@
+
+ NPError new_stream(NPMIMEType type, NPStream * stream);
+ NPError destroy_stream(NPStream * stream);
+- int32 write(NPStream * stream, int32 len, void * buffer);
++ int32_t write(NPStream * stream, int32_t len, void * buffer);
+
+ //
+ // Scripting API method implementations.
+@@ -449,8 +452,8 @@
+ */
+ NPError NPP_New(const NPMIMEType,
+ const NPP instance,
+- uint16 /* mode */,
+- int16 /* argc */,
++ uint16_t /* mode */,
++ int16_t /* argc */,
+ char * /* argn */[],
+ char * /* argv */[],
+ NPSavedData *)
+@@ -540,7 +543,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; }
+
+@@ -576,22 +579,22 @@
+ */
+
+ namespace {
+- int32 STREAMBUFSIZE = 0X0FFFFFFF; /* If we are reading from a file in
++ int32_t STREAMBUFSIZE = 0X0FFFFFFF; /* If we are reading from a file in
+ * NPAsFile mode so we can take any size
+ * stream in our write call (since we
+ * ignore it) */
+ }
+
+-int32 NPP_WriteReady(NPP, NPStream *)
++int32_t NPP_WriteReady(NPP, NPStream *)
+ {
+ return STREAMBUFSIZE;
+ }
+
+
+-int32 NPP_Write(const NPP instance,
++int32_t NPP_Write(const NPP instance,
+ NPStream * const stream,
+- int32 /* offset */,
+- const int32 len,
++ int32_t /* offset */,
++ const int32_t len,
+ void * const buffer)
+ {
+ if (!instance || !instance->pdata) { return 0; }
+@@ -657,7 +660,7 @@
+ }
+ }
+
+-int16 NPP_HandleEvent(NPP, void * /* event */)
++int16_t NPP_HandleEvent(NPP, void * /* event */)
+ {
+ return true;
+ }
+@@ -737,7 +740,7 @@
+ NPError NPN_PostURLNotify(NPP instance,
+ const char * url,
+ const char * window,
+- uint32 len,
++ uint32_t len,
+ const char * buf,
+ NPBool file,
+ void * notifyData)
+@@ -758,7 +761,7 @@
+ NPError NPN_PostURL(NPP instance,
+ const char * url,
+ const char * window,
+- uint32 len,
++ uint32_t len,
+ const char * buf,
+ NPBool file)
+ {
+@@ -793,7 +796,7 @@
+ : NPERR_INCOMPATIBLE_VERSION_ERROR;
+ }
+
+-int32 NPN_Write(NPP instance, NPStream * stream, int32 len, void * buffer)
++int32_t NPN_Write(NPP instance, NPStream * stream, int32_t len, void * buffer)
+ {
+ const int navMinorVersion = mozillaFuncs.version & 0xFF;
+ return (navMinorVersion >= NPVERS_HAS_STREAMOUTPUT)
+@@ -822,7 +825,7 @@
+ return CallNPN_UserAgentProc(mozillaFuncs.uagent, instance);
+ }
+
+-void * NPN_MemAlloc(uint32 size)
++void * NPN_MemAlloc(uint32_t size)
+ {
+ return CallNPN_MemAllocProc(mozillaFuncs.memalloc, size);
+ }
+@@ -832,7 +835,7 @@
+ CallNPN_MemFreeProc(mozillaFuncs.memfree, ptr);
+ }
+
+-uint32 NPN_MemFlush(uint32 size)
++uint32_t NPN_MemFlush(uint32_t size)
+ {
+ return CallNPN_MemFlushProc(mozillaFuncs.memflush, size);
+ }
+@@ -1259,9 +1262,9 @@
+ return NPERR_NO_ERROR;
+ }
+
+- int32 plugin_instance::write(NPStream * const stream,
+- const int32 len,
+- void * const buffer)
++ int32_t plugin_instance::write(NPStream * const stream,
++ const int32_t len,
++ void * const buffer)
+ {
+ if (!this->browser) { return 0; }
+
Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- openvrml.spec 28 Feb 2009 02:55:42 -0000 1.57
+++ openvrml.spec 28 Feb 2009 05:38:32 -0000 1.58
@@ -1,7 +1,7 @@
# -*- rpm-spec -*-
Name: openvrml
Version: 0.17.10
-Release: 5.0%{?dist}
+Release: 6.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-6.0
+- Define XP_UNIX and use new integer type names in the Gecko plug-in.
+
* Fri Feb 27 2009 Braden McDaniel <braden at endoframe.com> - 0.17.10-5.0
- Looks like we need to include npapi.h now, too.
More information about the scm-commits
mailing list