rpms/openvrml/devel npfunctions.patch, 1.3, 1.4 openvrml.spec, 1.58, 1.59
Braden McDaniel
braden at fedoraproject.org
Sat Feb 28 06:08:20 UTC 2009
- Previous message (by thread): rpms/perl-DateTime-Format-Natural/devel .cvsignore, 1.3, 1.4 perl-DateTime-Format-Natural.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message (by thread): rpms/avr-binutils/devel avr-binutils.spec, 1.8, 1.9 patch-coff-avr.patch, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: braden
Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30936
Modified Files:
npfunctions.patch openvrml.spec
Log Message:
Looks like Gecko now provides the NPN_* entry points like the old Netscape did.
npfunctions.patch:
Index: npfunctions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/npfunctions.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- npfunctions.patch 28 Feb 2009 05:38:31 -0000 1.3
+++ npfunctions.patch 28 Feb 2009 06:08:20 -0000 1.4
@@ -1,6 +1,6 @@
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 00:32:36.000000000 -0500
++++ openvrml-0.17.10-npfunctions/mozilla-plugin/src/openvrml.cpp 2009-02-28 01:03:19.000000000 -0500
@@ -31,7 +31,10 @@
# include <boost/noncopyable.hpp>
# include <boost/ref.hpp>
@@ -22,6 +22,38 @@
//
// Scripting API method implementations.
+@@ -337,11 +340,11 @@
+ //
+ // Make sure the browser supports XEmbed plug-ins.
+ //
+- PRBool supportsXEmbed = PR_FALSE;
+- err = CallNPN_GetValueProc(mozillaFuncs.getvalue,
+- 0,
+- NPNVSupportsXEmbedBool,
+- &supportsXEmbed);
++ NPBool supportsXEmbed = false;
++ err = NPN_GetValue(mozillaFuncs.getvalue,
++ 0,
++ NPNVSupportsXEmbedBool,
++ &supportsXEmbed);
+
+ if (err != NPERR_NO_ERROR || !supportsXEmbed) {
+ return NPERR_INCOMPATIBLE_VERSION_ERROR;
+@@ -351,10 +354,10 @@
+ // Make sure the browser tookit is Gtk2.
+ //
+ NPNToolkitType toolkit = NPNToolkitType();
+- err = CallNPN_GetValueProc(mozillaFuncs.getvalue,
+- 0,
+- NPNVToolkit,
+- &toolkit);
++ err = NPN_GetValue(mozillaFuncs.getvalue,
++ 0,
++ NPNVToolkit,
++ &toolkit);
+
+ if (err != NPERR_NO_ERROR || toolkit != NPNVGtk2) {
+ return NPERR_INCOMPATIBLE_VERSION_ERROR;
@@ -449,8 +452,8 @@
*/
NPError NPP_New(const NPMIMEType,
@@ -79,52 +111,324 @@
{
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;
- }
+@@ -684,7 +687,7 @@
--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);
+ switch (variable) {
+ case NPPVpluginNeedsXEmbed:
+- *static_cast<PRBool *>(value) = PR_TRUE;
++ *static_cast<NPBool *>(value) = true;
+ break;
+ case NPPVpluginScriptableNPObject:
+ assert(npp->pdata);
+@@ -703,307 +706,6 @@
+ return NPERR_NO_ERROR;
}
+-void NPN_Version(int * plugin_major,
+- int * plugin_minor,
+- int * mozilla_major,
+- int * mozilla_minor)
+-{
+- *plugin_major = NP_VERSION_MAJOR;
+- *plugin_minor = NP_VERSION_MINOR;
+- *mozilla_major = mozillaFuncs.version >> 8;
+- *mozilla_minor = mozillaFuncs.version & 0xff;
+-}
+-
+-NPError NPN_GetURLNotify(NPP instance,
+- const char * url,
+- const char * target,
+- void * notifyData)
+-{
+- const int navMinorVers = mozillaFuncs.version & 0xFF;
+- return (navMinorVers >= NPVERS_HAS_NOTIFICATION)
+- ? CallNPN_GetURLNotifyProc(mozillaFuncs.geturlnotify,
+- instance,
+- url,
+- target,
+- notifyData)
+- : NPERR_INCOMPATIBLE_VERSION_ERROR;
+-}
+-
+-NPError NPN_GetURL(NPP instance, const char * url, const char * target)
+-{
+- return CallNPN_GetURLProc(mozillaFuncs.geturl, instance, url, target);
+-}
+-
+-NPError NPN_PostURLNotify(NPP instance,
+- const char * url,
+- const char * window,
+- uint32 len,
+- const char * buf,
+- NPBool file,
+- void * notifyData)
+-{
+- const int navMinorVers = mozillaFuncs.version & 0xFF;
+- return (navMinorVers >= NPVERS_HAS_NOTIFICATION)
+- ? CallNPN_PostURLNotifyProc(mozillaFuncs.posturlnotify,
+- instance,
+- url,
+- window,
+- len,
+- buf,
+- file,
+- notifyData)
+- : NPERR_INCOMPATIBLE_VERSION_ERROR;
+-}
+-
+-NPError NPN_PostURL(NPP instance,
+- const char * url,
+- const char * window,
+- uint32 len,
+- const char * buf,
+- NPBool file)
+-{
+- return CallNPN_PostURLProc(mozillaFuncs.posturl,
+- instance,
+- url,
+- window,
+- len,
+- buf,
+- file);
+-}
+-
+-NPError NPN_RequestRead(NPStream * stream, NPByteRange * rangeList)
+-{
+- return CallNPN_RequestReadProc(mozillaFuncs.requestread,
+- stream,
+- rangeList);
+-}
+-
+-NPError NPN_NewStream(NPP instance,
+- NPMIMEType type,
+- const char * target,
+- NPStream ** stream)
+-{
+- const int navMinorVersion = mozillaFuncs.version & 0xFF;
+- return (navMinorVersion >= NPVERS_HAS_STREAMOUTPUT)
+- ? CallNPN_NewStreamProc(mozillaFuncs.newstream,
+- instance,
+- type,
+- target,
+- stream)
+- : NPERR_INCOMPATIBLE_VERSION_ERROR;
+-}
+-
+-int32 NPN_Write(NPP instance, NPStream * stream, int32 len, void * buffer)
+-{
+- const int navMinorVersion = mozillaFuncs.version & 0xFF;
+- return (navMinorVersion >= NPVERS_HAS_STREAMOUTPUT)
+- ? CallNPN_WriteProc(mozillaFuncs.write, instance, stream, len, buffer)
+- : -1;
+-}
+-
+-NPError NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
+-{
+- const int navMinorVersion = mozillaFuncs.version & 0xFF;
+- return (navMinorVersion >= NPVERS_HAS_STREAMOUTPUT)
+- ? CallNPN_DestroyStreamProc(mozillaFuncs.destroystream,
+- instance,
+- stream,
+- reason)
+- : NPERR_INCOMPATIBLE_VERSION_ERROR;
+-}
+-
+-void NPN_Status(NPP instance, const char * message)
+-{
+- CallNPN_StatusProc(mozillaFuncs.status, instance, message);
+-}
+-
+-const char * NPN_UserAgent(NPP instance)
+-{
+- 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);
- }
-
+-{
+- return CallNPN_MemAllocProc(mozillaFuncs.memalloc, size);
+-}
+-
+-void NPN_MemFree(void * ptr)
+-{
+- 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 CallNPN_MemFlushProc(mozillaFuncs.memflush, size);
+-}
+-
+-void NPN_ReloadPlugins(NPBool reloadPages)
+-{
+- CallNPN_ReloadPluginsProc(mozillaFuncs.reloadplugins, reloadPages);
+-}
+-
+-JRIEnv * NPN_GetJavaEnv()
+-{
+- return CallNPN_GetJavaEnvProc(mozillaFuncs.getJavaEnv);
+-}
+-
+-jref NPN_GetJavaPeer(NPP instance)
+-{
+- return CallNPN_GetJavaPeerProc(mozillaFuncs.getJavaPeer, instance);
+-}
+-
+-NPError NPN_GetValue(NPP instance, NPNVariable variable, void * value)
+-{
+- return CallNPN_GetValueProc(mozillaFuncs.getvalue,
+- instance,
+- variable,
+- value);
+-}
+-
+-NPError NPN_SetValue(NPP instance, NPPVariable variable, void * value)
+-{
+- return CallNPN_SetValueProc(mozillaFuncs.setvalue,
+- instance,
+- variable,
+- value);
+-}
+-
+-void NPN_InvalidateRect(NPP instance, NPRect * invalidRect)
+-{
+- CallNPN_InvalidateRectProc(mozillaFuncs.invalidaterect,
+- instance,
+- invalidRect);
+-}
+-
+-void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
+-{
+- CallNPN_InvalidateRegionProc(mozillaFuncs.invalidateregion,
+- instance,
+- invalidRegion);
+-}
+-
+-void NPN_ForceRedraw(NPP instance)
+-{
+- CallNPN_ForceRedrawProc(mozillaFuncs.forceredraw, instance);
+-}
+-
+-void NPN_ReleaseVariantValue(NPVariant * variant)
+-{
+- CallNPN_ReleaseVariantValueProc(mozillaFuncs.releasevariantvalue, variant);
+-}
+-
+-NPIdentifier NPN_GetStringIdentifier(const NPUTF8 * name)
+-{
+- return CallNPN_GetStringIdentifierProc(mozillaFuncs.getstringidentifier,
+- name);
+-}
+-
+-void NPN_GetStringIdentifiers(const NPUTF8 ** names,
+- int32_t nameCount,
+- NPIdentifier * identifiers)
+-{
+- CallNPN_GetStringIdentifiersProc(mozillaFuncs.getstringidentifiers,
+- names,
+- nameCount,
+- identifiers);
+-}
+-
+-NPIdentifier NPN_GetIntIdentifier(int32_t intid)
+-{
+- return CallNPN_GetIntIdentifierProc(mozillaFuncs.getintidentifier, intid);
+-}
+-
+-bool NPN_IdentifierIsString(NPIdentifier * identifier)
+-{
+- return CallNPN_IdentifierIsStringProc(mozillaFuncs.identifierisstring,
+- identifier);
+-}
+-
+-NPUTF8 * NPN_UTF8FromIdentifier(NPIdentifier identifier)
+-{
+- return CallNPN_UTF8FromIdentifierProc(mozillaFuncs.utf8fromidentifier,
+- identifier);
+-}
+-
+-int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
+-{
+- return CallNPN_IntFromIdentifierProc(mozillaFuncs.intfromidentifier,
+- identifier);
+-}
+-
+-NPObject * NPN_CreateObject(NPP npp, NPClass * aClass)
+-{
+- return CallNPN_CreateObjectProc(mozillaFuncs.createobject, npp, aClass);
+-}
+-
+-NPObject * NPN_RetainObject(NPObject * npobj)
+-{
+- return CallNPN_RetainObjectProc(mozillaFuncs.retainobject, npobj);
+-}
+-
+-void NPN_ReleaseObject(NPObject * npobj)
+-{
+- CallNPN_ReleaseObjectProc(mozillaFuncs.releaseobject, npobj);
+-}
+-
+-bool NPN_Invoke(NPP npp, NPObject * npobj, NPIdentifier methodName,
+- const NPVariant * args, uint32_t argCount, NPVariant * result)
+-{
+- return CallNPN_InvokeProc(mozillaFuncs.invoke,
+- npp, npobj, methodName, args, argCount, result);
+-}
+-
+-bool NPN_InvokeDefault(NPP npp, NPObject * npobj, const NPVariant * args,
+- uint32_t argCount, NPVariant * result)
+-{
+- return CallNPN_InvokeDefaultProc(mozillaFuncs.invokeDefault,
+- npp, npobj, args, argCount, result);
+-}
+-
+-bool NPN_Evaluate(NPP npp, NPObject * npobj, NPString * script,
+- NPVariant * result)
+-{
+- return CallNPN_EvaluateProc(mozillaFuncs.evaluate, npp, npobj, script,
+- result);
+-}
+-
+-bool NPN_GetProperty(NPP npp, NPObject * npobj, NPIdentifier propertyName,
+- NPVariant * result)
+-{
+- return CallNPN_GetPropertyProc(mozillaFuncs.getproperty,
+- npp, npobj, propertyName, result);
+-}
+-
+-bool NPN_SetProperty(NPP npp, NPObject * npobj, NPIdentifier propertyName,
+- const NPVariant * result)
+-{
+- return CallNPN_SetPropertyProc(mozillaFuncs.setproperty,
+- npp, npobj, propertyName, result);
+-}
+-
+-bool NPN_RemoveProperty(NPP npp, NPObject * npobj, NPIdentifier propertyName)
+-{
+- return CallNPN_RemovePropertyProc(mozillaFuncs.removeproperty,
+- npp, npobj, propertyName);
+-}
+-
+-bool NPN_HasProperty(NPP npp, NPObject * npobj, NPIdentifier propertyName)
+-{
+- return CallNPN_HasPropertyProc(mozillaFuncs.hasproperty,
+- npp, npobj, propertyName);
+-}
+-
+-bool NPN_HasMethod(NPP npp, NPObject * npobj, NPIdentifier methodName)
+-{
+- return CallNPN_HasMethodProc(mozillaFuncs.hasmethod,
+- npp, npobj, methodName);
+-}
+-
+-void NPN_SetException(NPObject * npobj, const NPUTF8 * message)
+-{
+- return CallNPN_SetExceptionProc(mozillaFuncs.setexception, npobj, message);
+-}
+-
+ namespace {
+
+ boost::scoped_ptr<const script_callback_map> script_callback_map::instance_;
+@@ -1259,9 +961,9 @@
return NPERR_NO_ERROR;
}
Index: openvrml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openvrml/devel/openvrml.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- openvrml.spec 28 Feb 2009 05:38:32 -0000 1.58
+++ openvrml.spec 28 Feb 2009 06:08:20 -0000 1.59
@@ -1,7 +1,7 @@
# -*- rpm-spec -*-
Name: openvrml
Version: 0.17.10
-Release: 6.0%{?dist}
+Release: 7.0%{?dist}
Summary: VRML/X3D runtime library
License: LGPLv3+
Group: System Environment/Libraries
@@ -171,6 +171,10 @@
%changelog
+* 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.
+
* 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.
- Previous message (by thread): rpms/perl-DateTime-Format-Natural/devel .cvsignore, 1.3, 1.4 perl-DateTime-Format-Natural.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message (by thread): rpms/avr-binutils/devel avr-binutils.spec, 1.8, 1.9 patch-coff-avr.patch, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list