rpms/openvrml/devel xulrunner-1.9.2.patch, NONE, 1.1 openvrml.spec, 1.86, 1.87
Braden McDaniel
braden at fedoraproject.org
Thu Jan 14 23:38:59 UTC 2010
Author: braden
Update of /cvs/pkgs/rpms/openvrml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27789
Modified Files:
openvrml.spec
Added Files:
xulrunner-1.9.2.patch
Log Message:
Patch for compatibility with xulrunner-1.9.2.
xulrunner-1.9.2.patch:
openvrml.cpp | 45 ++++++++++++++++++++-------------------------
1 file changed, 20 insertions(+), 25 deletions(-)
--- NEW FILE xulrunner-1.9.2.patch ---
Index: src/mozilla-plugin/openvrml.cpp
===================================================================
--- src/mozilla-plugin/openvrml.cpp (revision 4058)
+++ src/mozilla-plugin/openvrml.cpp (working copy)
@@ -123,7 +123,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.
@@ -339,7 +339,7 @@
//
// Make sure the browser supports XEmbed plug-ins.
//
- PRBool supportsXEmbed = PR_FALSE;
+ NPBool supportsXEmbed = false;
err = NPN_GetValue(0, NPNVSupportsXEmbedBool, &supportsXEmbed);
if (err != NPERR_NO_ERROR || !supportsXEmbed) {
@@ -572,23 +572,23 @@
*/
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,
- NPStream * const stream,
- int32 /* offset */,
- const int32 len,
- void * const buffer)
+int32_t NPP_Write(const NPP instance,
+ NPStream * const stream,
+ int32_t /* offset */,
+ const int32_t len,
+ void * const buffer)
{
if (!instance || !instance->pdata) { return 0; }
@@ -665,11 +665,6 @@
void * /* notifyData */)
{}
-jref NPP_GetJavaClass()
-{
- return 0;
-}
-
NPError NPP_GetValue(const NPP npp,
const NPPVariable variable,
void * const value)
@@ -681,7 +676,7 @@
switch (variable) {
case NPPVpluginNeedsXEmbed:
- *static_cast<PRBool *>(value) = PR_TRUE;
+ *static_cast<NPBool *>(value) = true;
break;
case NPPVpluginScriptableNPObject:
assert(npp->pdata);
@@ -730,7 +725,7 @@
NPError NPN_PostURLNotify(NPP instance,
const char * url,
const char * window,
- uint32 len,
+ uint32_t len,
const char * buf,
NPBool file,
void * notifyData)
@@ -750,7 +745,7 @@
NPError NPN_PostURL(NPP instance,
const char * url,
const char * window,
- uint32 len,
+ uint32_t len,
const char * buf,
NPBool file)
{
@@ -773,7 +768,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)
@@ -799,7 +794,7 @@
return mozillaFuncs.uagent(instance);
}
-void * NPN_MemAlloc(uint32 size)
+void * NPN_MemAlloc(uint32_t size)
{
return mozillaFuncs.memalloc(size);
}
@@ -809,7 +804,7 @@
mozillaFuncs.memfree(ptr);
}
-uint32 NPN_MemFlush(uint32 size)
+uint32_t NPN_MemFlush(uint32_t size)
{
return mozillaFuncs.memflush(size);
}
@@ -824,9 +819,9 @@
return static_cast<JRIEnv *>(mozillaFuncs.getJavaEnv());
}
-jref NPN_GetJavaPeer(NPP instance)
+void * NPN_GetJavaPeer(NPP instance)
{
- return static_cast<jref>(mozillaFuncs.getJavaPeer(instance));
+ return mozillaFuncs.getJavaPeer(instance);
}
NPError NPN_GetValue(NPP instance, NPNVariable variable, void * value)
@@ -1211,9 +1206,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.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- openvrml.spec 15 Nov 2009 08:47:35 -0000 1.86
+++ openvrml.spec 14 Jan 2010 23:38:58 -0000 1.87
@@ -1,11 +1,12 @@
# -*- rpm-spec -*-
Name: openvrml
Version: 0.18.3
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: VRML/X3D player and runtime library
License: LGPLv3+
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/openvrml/%{name}-%{version}.tar.gz
+Patch0: xulrunner-1.9.2.patch
URL: http://openvrml.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig >= 0.18.0
@@ -135,6 +136,7 @@ OpenVRML API documentation.
%prep
%setup
+%patch0 -p1
%build
CXXFLAGS="%optflags -fvisibility=hidden -fvisibility-inlines-hidden -Wno-missing-braces"
@@ -235,6 +237,9 @@ CXXFLAGS="%optflags -fvisibility=hidden
%doc %{_datadir}/doc/libopenvrml-%{version}/manual
%changelog
+* Thu Jan 14 2010 Braden McDaniel <braden at endoframe.com> - 0.18.3-13
+- Patch for compatibility with xulrunner-1.9.2.
+
* Sun Nov 15 2009 Braden McDaniel <braden at endoframe.com> - 0.18.3-12
- Rebuild.
More information about the scm-commits
mailing list