Jakub Jelinek pisze: > On Wed, Feb 18, 2009 at 04:52:04PM +0100, Julian Sikorski wrote: >> Thanks guys, with the info you have provided Jean has managed to produce >> patches fixing the issue. As I said before, there are some problems with >> the new xulrunner (npupp.h does not exist any more): >> http://belegdol.fedorapeople.org/build.log >> The srpm package is also available on my fedorapeople page: >> http://belegdol.fedorapeople.org/gnome-chemistry-utils-0.10.3-2.fc11.src.rpm >> Thanks in advance again! > > See > http://cvs.savannah.gnu.org/viewvc/classpath/native/plugin/gcjwebplugin.cc?root=classpath&r1=1.13&r2=1.14&diff_format=u > what had to change in gcjwebplugin.cc to accomodate the npupp.h -> > npfunctions.h changes. > > Jakub > Without any idea what am I doing, I have created the attached patch. Unfortunately, it does not help much. Links are the same as before. Julian
--- mozilla-plugin/moz-plugin.c.xulrunner191 2009-02-18 17:17:46.000000000 +0100 +++ mozilla-plugin/moz-plugin.c 2009-02-18 17:25:11.000000000 +0100 @@ -22,7 +22,11 @@ #include <config.h> #include "npapi.h" +#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) #include "npupp.h" +#else +#include "npfunctions.h" +#endif #include <unistd.h> #include <string.h> @@ -220,15 +224,30 @@ pluginFuncs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; pluginFuncs->size = sizeof (NPPluginFuncs); +#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) pluginFuncs->newp = NewNPP_NewProc (ChemNew); pluginFuncs->destroy = NewNPP_DestroyProc (ChemDestroy); pluginFuncs->setwindow = NewNPP_SetWindowProc (ChemSetWindow); pluginFuncs->newstream = NewNPP_NewStreamProc (ChemNewStream); +#else + pluginFuncs->newp = (NPP_NewProcPtr) (ChemNew); + pluginFuncs->destroy = (NPP_DestroyProcPtr) (ChemDestroy); + pluginFuncs->setwindow = (NPP_SetWindowProcPtr) (ChemSetWindow); + pluginFuncs->newstream = (NPP_NewStreamProcPtr) (ChemNewStream); +#endif pluginFuncs->destroystream = NULL; +#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) pluginFuncs->asfile = NewNPP_StreamAsFileProc (ChemStreamAsFile); +#else + pluginFuncs->asfile = (NPP_StreamAsFileProcPtr) (ChemStreamAsFile); +#endif pluginFuncs->writeready = NULL; pluginFuncs->write = NULL; +#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20) pluginFuncs->print = NewNPP_PrintProc (ChemPrint); +#else + pluginFuncs->print = (NPP_PrintProcPtr) (ChemPrint); +#endif pluginFuncs->urlnotify = NULL; pluginFuncs->event = NULL; #ifdef OJI
-- fedora-devel-list mailing list fedora-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-devel-list
