rpms/gnome-chemistry-utils/devel gnome-chemistry-npapi-1.9.1.patch, NONE, 1.1 gnome-chemistry-utils.spec, 1.33, 1.34

[Martin Stransky]

Author: stransky

Update of /cvs/pkgs/rpms/gnome-chemistry-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18757

Modified Files:
	gnome-chemistry-utils.spec 
Added Files:
	gnome-chemistry-npapi-1.9.1.patch 
Log Message:
* Tue Feb 24 2009 Martin Stransky <stransky at redhat.com> - 0.10.3-3
- Patched for NPAPI 1.9.1



gnome-chemistry-npapi-1.9.1.patch:

--- NEW FILE gnome-chemistry-npapi-1.9.1.patch ---
diff -up gnome-chemistry-utils-0.10.3/mozilla-plugin/moz-plugin.c.npapi gnome-chemistry-utils-0.10.3/mozilla-plugin/moz-plugin.c
--- gnome-chemistry-utils-0.10.3/mozilla-plugin/moz-plugin.c.npapi	2009-02-24 14:03:42.000000000 +0100
+++ gnome-chemistry-utils-0.10.3/mozilla-plugin/moz-plugin.c	2009-02-24 14:25:15.000000000 +0100
@@ -20,6 +20,8 @@
  * Boston, MA  02111-1307, USA.
  */
 
+#define HAVE_NPFUNCTIONS_H 1
+
 #include <config.h>
 #include "npapi.h"
 #ifdef HAVE_NPFUNCTIONS_H
@@ -51,7 +53,7 @@ typedef struct {
 } ChemPlugin;
 
 static NPError ChemNew (NPMIMEType mime_type, NPP instance,
-				 uint16 mode, uint16 argc, char *argn[], char *argv[],
+				 uint16_t mode, uint16_t argc, char *argn[], char *argv[],
 				 NPSavedData *saved)
 {
 	ChemPlugin *plugin;
@@ -149,7 +151,7 @@ static NPError ChemSetWindow (NPP instan
 }
 
 static NPError ChemNewStream (NPP instance, NPMIMEType type, NPStream *stream,
-		      NPBool seekable, uint16 *stype)
+		      NPBool seekable, uint16_t *stype)
 {
 	ChemPlugin *plugin;
 
@@ -224,15 +226,15 @@ NPError NP_Initialize(NPNetscapeFuncs *m
 	
 	pluginFuncs->version    = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
 	pluginFuncs->size       = sizeof (NPPluginFuncs);
-	pluginFuncs->newp       = NewNPP_NewProc (ChemNew);
-	pluginFuncs->destroy    = NewNPP_DestroyProc (ChemDestroy);
-	pluginFuncs->setwindow  = NewNPP_SetWindowProc (ChemSetWindow);
-	pluginFuncs->newstream  = NewNPP_NewStreamProc (ChemNewStream);
+	pluginFuncs->newp       = (NPP_NewProcPtr)ChemNew;
+	pluginFuncs->destroy    = (NPP_DestroyProcPtr) ChemDestroy;
+	pluginFuncs->setwindow  = (NPP_SetWindowProcPtr) ChemSetWindow;
+	pluginFuncs->newstream  = (NPP_NewStreamProcPtr) ChemNewStream;
 	pluginFuncs->destroystream = NULL;
-	pluginFuncs->asfile     = NewNPP_StreamAsFileProc (ChemStreamAsFile);
+	pluginFuncs->asfile     = (NPP_StreamAsFileProcPtr) ChemStreamAsFile;
 	pluginFuncs->writeready = NULL;
 	pluginFuncs->write      = NULL;
-	pluginFuncs->print      = NewNPP_PrintProc (ChemPrint);
+	pluginFuncs->print      = (NPP_PrintProcPtr) ChemPrint;
 	pluginFuncs->urlnotify  = NULL;
 	pluginFuncs->event      = NULL;
 #ifdef OJI


Index: gnome-chemistry-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-chemistry-utils/devel/gnome-chemistry-utils.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- gnome-chemistry-utils.spec	23 Feb 2009 14:24:26 -0000	1.33
+++ gnome-chemistry-utils.spec	24 Feb 2009 13:35:34 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           gnome-chemistry-utils
 Version:        0.10.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A set of chemical utilities
 
 Group:          Applications/Engineering
@@ -8,6 +8,7 @@
 URL:            http://www.nongnu.org/gchemutils/
 Source0:        http://download.savannah.nongnu.org/releases/gchemutils/0.10/%{name}-%{version}.tar.bz2
 Patch0:         25628-2.patch
+Patch1:         gnome-chemistry-npapi-1.9.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bodr
@@ -74,6 +75,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .gcc44
+%patch1 -p1 -b .npapi
 
 %build
 %configure --disable-update-databases \
@@ -219,6 +221,9 @@
 
 
 %changelog
+* Tue Feb 24 2009 Martin Stransky <stransky at redhat.com> - 0.10.3-3
+- Patched for NPAPI 1.9.1
+
 * Wed Feb 18 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.10.3-2
 - Patched gcc-4.4 build issues
 - Fixed the Source URL