rpms/nspluginwrapper/F-9 nspluginwrapper-1.1.0-build.patch, 1.1, 1.2 nspluginwrapper-1.1.0-fork.patch, 1.1, 1.2 nspluginwrapper-1.1.0-runtime-restart.patch, 1.1, 1.2 nspluginwrapper.spec, 1.49, 1.50

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27528

Modified Files:
	nspluginwrapper-1.1.0-build.patch 
	nspluginwrapper-1.1.0-fork.patch 
	nspluginwrapper-1.1.0-runtime-restart.patch 
	nspluginwrapper.spec 
Log Message:
* Tue Jul 15 2008 Martin Stransky <stransky at redhat.com> 1.1.0-2
- Fixed build warnings in our patches



nspluginwrapper-1.1.0-build.patch:

Index: nspluginwrapper-1.1.0-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-build.patch	8 Jul 2008 14:54:18 -0000	1.1
+++ nspluginwrapper-1.1.0-build.patch	15 Jul 2008 13:53:23 -0000	1.2
@@ -5,7 +5,7 @@
  #  nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne
  #  derived from qemu configure script, (C) 2003 Fabrice Bellard
  #
-+set -x
++#set -x
 +
  PACKAGE=nspluginwrapper
  

nspluginwrapper-1.1.0-fork.patch:

Index: nspluginwrapper-1.1.0-fork.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-fork.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-fork.patch	8 Jul 2008 14:54:18 -0000	1.1
+++ nspluginwrapper-1.1.0-fork.patch	15 Jul 2008 13:53:23 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.fork nspluginwrapper-1.1.0/src/npw-viewer.c
---- nspluginwrapper-1.1.0/src/npw-viewer.c.fork	2008-07-08 14:23:26.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-viewer.c	2008-07-08 14:26:58.000000000 +0200
+--- nspluginwrapper-1.1.0/src/npw-viewer.c.fork	2008-07-15 15:33:06.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-viewer.c	2008-07-15 15:42:07.000000000 +0200
 @@ -67,6 +67,20 @@
  // RPC global connections
  rpc_connection_t *g_rpc_connection attribute_hidden = NULL;
@@ -28,7 +28,7 @@
    D(bug("NPN_ForceRedraw instance=%p\n", instance));
 +	
 +  if(!pid_check())
-+	return NPERR_INVALID_INSTANCE_ERROR;
++	return;
  
    UNIMPLEMENTED();
  }
@@ -74,7 +74,7 @@
  	return;
 +      
 +  if(!pid_check())
-+      return NPERR_INVALID_INSTANCE_ERROR;
++      return;
  
    D(bug("NPN_InvalidateRect instance=%p\n", instance));
    invoke_NPN_InvalidateRect(instance, invalidRect);
@@ -84,7 +84,7 @@
    D(bug("NPN_InvalidateRegion instance=%p\n", instance));
 +	
 +  if(!pid_check())
-+	return NPERR_INVALID_INSTANCE_ERROR;
++	return;
  
    UNIMPLEMENTED();
  }
@@ -166,22 +166,24 @@
  g_NPN_Status(NPP instance, const char *message)
  {
 +  if(!pid_check())
-+	return NPERR_INVALID_INSTANCE_ERROR;
++	return;
 +  
    D(bug("NPN_Status instance=%p\n", instance));
    invoke_NPN_Status(instance, message);
    D(bug(" done\n"));
-@@ -1130,6 +1183,9 @@ invoke_NPN_UserAgent(void)
+@@ -1130,6 +1183,11 @@ invoke_NPN_UserAgent(void)
  static const char *
  g_NPN_UserAgent(NPP instance)
  {
-+  if(!pid_check())
-+	return NPERR_INVALID_INSTANCE_ERROR;
++  if(!pid_check()) {
++	static char tmp_agent_string[] = "None";
++	return tmp_agent_string;
++  }
 +  
    D(bug("NPN_UserAgent instance=%p\n", instance));
    if (g_user_agent == NULL)
  	g_user_agent = invoke_NPN_UserAgent();
-@@ -1212,6 +1268,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM
+@@ -1212,6 +1270,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM
  static NPError
  g_NPN_NewStream(NPP instance, NPMIMEType type, const char *target, NPStream **stream)
  {
@@ -190,7 +192,7 @@
    if (instance == NULL)
  	return NPERR_INVALID_INSTANCE_ERROR;
  
-@@ -1257,6 +1315,9 @@ invoke_NPN_DestroyStream(NPP instance, N
+@@ -1257,6 +1317,9 @@ invoke_NPN_DestroyStream(NPP instance, N
  static NPError
  g_NPN_DestroyStream(NPP instance, NPStream *stream, NPError reason)
  {
@@ -200,7 +202,7 @@
    if (instance == NULL)
  	return NPERR_INVALID_INSTANCE_ERROR;
  
-@@ -1314,6 +1375,9 @@ invoke_NPN_Write(NPP instance, NPStream 
+@@ -1314,6 +1377,9 @@ invoke_NPN_Write(NPP instance, NPStream 
  static int32
  g_NPN_Write(NPP instance, NPStream *stream, int32 len, void *buf)
  {
@@ -210,7 +212,7 @@
    if (instance == NULL)
  	return -1;
  
-@@ -1350,6 +1414,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in
+@@ -1350,6 +1416,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in
  static void
  g_NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
  {
@@ -219,7 +221,7 @@
    if (instance == NULL)
  	return;
  
-@@ -1381,6 +1447,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins
+@@ -1381,6 +1449,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins
  static void
  g_NPN_PopPopupsEnabledState(NPP instance)
  {
@@ -228,7 +230,7 @@
    if (instance == NULL)
  	return;
  
-@@ -1480,6 +1548,9 @@ invoke_NPN_CreateObject(NPP instance)
+@@ -1480,6 +1550,9 @@ invoke_NPN_CreateObject(NPP instance)
  static NPObject *
  g_NPN_CreateObject(NPP instance, NPClass *class)
  {
@@ -238,7 +240,7 @@
    if (instance == NULL)
  	return NULL;
  
-@@ -1520,6 +1591,9 @@ invoke_NPN_RetainObject(NPObject *npobj)
+@@ -1520,6 +1593,9 @@ invoke_NPN_RetainObject(NPObject *npobj)
  static NPObject *
  g_NPN_RetainObject(NPObject *npobj)
  {
@@ -248,7 +250,7 @@
    if (npobj == NULL)
  	return NULL;
  
-@@ -1558,6 +1632,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj
+@@ -1558,6 +1634,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj
  static void
  g_NPN_ReleaseObject(NPObject *npobj)
  {
@@ -258,7 +260,7 @@
    if (npobj == NULL)
  	return;
  
-@@ -1605,6 +1682,9 @@ static bool
+@@ -1605,6 +1684,9 @@ static bool
  g_NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName,
  			 const NPVariant *args, uint32_t argCount, NPVariant *result)
  {
@@ -268,7 +270,7 @@
    if (!instance || !npobj || !npobj->_class || !npobj->_class->invoke)
  	return false;
  
-@@ -1652,6 +1732,9 @@ static bool
+@@ -1652,6 +1734,9 @@ static bool
  g_NPN_InvokeDefault(NPP instance, NPObject *npobj,
  					const NPVariant *args, uint32_t argCount, NPVariant *result)
  {
@@ -278,7 +280,7 @@
    if (!instance || !npobj || !npobj->_class || !npobj->_class->invokeDefault)
  	return false;
  
-@@ -1697,6 +1780,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje
+@@ -1697,6 +1782,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje
  static bool
  g_NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result)
  {
@@ -288,7 +290,7 @@
    if (!instance || !npobj)
  	return false;
  
-@@ -1746,6 +1832,9 @@ static bool
+@@ -1746,6 +1834,9 @@ static bool
  g_NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName,
  				  NPVariant *result)
  {
@@ -298,7 +300,7 @@
    if (!instance || !npobj || !npobj->_class || !npobj->_class->getProperty)
  	return false;
  
-@@ -1792,6 +1881,9 @@ static bool
+@@ -1792,6 +1883,9 @@ static bool
  g_NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName,
  				  const NPVariant *value)
  {
@@ -308,7 +310,7 @@
    if (!instance || !npobj || !npobj->_class || !npobj->_class->setProperty)
  	return false;
  
-@@ -1833,6 +1925,9 @@ invoke_NPN_RemoveProperty(NPP instance, 
+@@ -1833,6 +1927,9 @@ invoke_NPN_RemoveProperty(NPP instance, 
  static bool
  g_NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
  {
@@ -318,7 +320,7 @@
    if (!instance || !npobj || !npobj->_class || !npobj->_class->removeProperty)
  	return false;
  
-@@ -1874,6 +1969,9 @@ invoke_NPN_HasProperty(NPP instance, NPO
+@@ -1874,6 +1971,9 @@ invoke_NPN_HasProperty(NPP instance, NPO
  static bool
  g_NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
  {
@@ -328,7 +330,7 @@
    if (!instance || !npobj || !npobj->_class || !npobj->_class->hasProperty)
  	return false;
  
-@@ -1915,6 +2013,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj
+@@ -1915,6 +2015,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj
  static bool
  g_NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName)
  {
@@ -338,7 +340,7 @@
    if (!instance || !npobj || !npobj->_class || !npobj->_class->hasMethod)
  	return false;
  
-@@ -1950,6 +2051,9 @@ invoke_NPN_SetException(NPObject *npobj,
+@@ -1950,6 +2053,9 @@ invoke_NPN_SetException(NPObject *npobj,
  static void
  g_NPN_SetException(NPObject *npobj, const NPUTF8 *message)
  {
@@ -348,7 +350,7 @@
    D(bug("NPN_SetException npobj=%p, message='%s'\n", npobj, message));
    invoke_NPN_SetException(npobj, message);
    D(bug(" done\n"));
-@@ -2011,6 +2115,8 @@ invoke_NPN_GetStringIdentifier(const NPU
+@@ -2011,6 +2117,8 @@ invoke_NPN_GetStringIdentifier(const NPU
  static NPIdentifier
  g_NPN_GetStringIdentifier(const NPUTF8 *name)
  {
@@ -357,7 +359,7 @@
    if (name == NULL)
  	return NULL;
  
-@@ -2060,6 +2166,9 @@ invoke_NPN_GetStringIdentifiers(const NP
+@@ -2060,6 +2168,9 @@ invoke_NPN_GetStringIdentifiers(const NP
  static void
  g_NPN_GetStringIdentifiers(const NPUTF8 **names, uint32_t nameCount, NPIdentifier *identifiers)
  {
@@ -367,7 +369,7 @@
    if (names == NULL)
  	return;
  
-@@ -2101,6 +2210,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti
+@@ -2101,6 +2212,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti
  static NPIdentifier
  g_NPN_GetIntIdentifier(int32_t intid)
  {
@@ -377,7 +379,7 @@
    D(bug("NPN_GetIntIdentifier intid=%d\n", intid));
    NPIdentifier ret = invoke_NPN_GetIntIdentifier(intid);
    D(bug(" return: %p\n", ret));
-@@ -2137,6 +2249,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi
+@@ -2137,6 +2251,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi
  static bool
  g_NPN_IdentifierIsString(NPIdentifier identifier)
  {
@@ -387,7 +389,7 @@
    D(bug("NPN_IdentifierIsString identifier=%p\n", identifier));
    bool ret = invoke_NPN_IdentifierIsString(identifier);
    D(bug(" return: %d\n", ret));
-@@ -2173,6 +2288,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi
+@@ -2173,6 +2290,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi
  static NPUTF8 *
  g_NPN_UTF8FromIdentifier(NPIdentifier identifier)
  {
@@ -397,7 +399,7 @@
    D(bug("NPN_UTF8FromIdentifier identifier=%p\n", identifier));
    NPUTF8 *ret = invoke_NPN_UTF8FromIdentifier(identifier);
    D(bug(" return: '%s'\n", ret));
-@@ -2210,6 +2328,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie
+@@ -2210,6 +2330,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie
  static int32_t
  g_NPN_IntFromIdentifier(NPIdentifier identifier)
  {
@@ -407,7 +409,7 @@
    D(bug("NPN_IntFromIdentifier identifier=%p\n", identifier));
    int32_t ret = invoke_NPN_IntFromIdentifier(identifier);
    D(bug(" return: %d\n", ret));
-@@ -3259,6 +3380,9 @@ static int do_main(int argc, char **argv
+@@ -3259,6 +3382,9 @@ static int do_main(int argc, char **argv
    }
    D(bug("  Plugin connection: %s\n", connection_path));
  

nspluginwrapper-1.1.0-runtime-restart.patch:

Index: nspluginwrapper-1.1.0-runtime-restart.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-runtime-restart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-runtime-restart.patch	8 Jul 2008 14:54:18 -0000	1.1
+++ nspluginwrapper-1.1.0-runtime-restart.patch	15 Jul 2008 13:53:23 -0000	1.2
@@ -398,7 +398,7 @@
  #endif
  
 +// This callback is called when the connection is closed or broken
-+typedef int (*rpc_error_callback_t)(rpc_connection_t *connection);
++typedef void (*rpc_error_callback_t)(rpc_connection_t *connection);
 +
 +// Set callback for a connection
 +void rpc_connection_error_callback_set(rpc_connection_t *connection, rpc_error_callback_t callback);


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nspluginwrapper.spec	8 Jul 2008 14:54:18 -0000	1.49
+++ nspluginwrapper.spec	15 Jul 2008 13:53:23 -0000	1.50
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.1.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -231,6 +231,9 @@
 %config %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Tue Jul 15 2008 Martin Stransky <stransky at redhat.com> 1.1.0-2
+- Fixed build warnings in our patches
+
 * Tue Jul 8 2008 Martin Stransky <stransky at redhat.com> 1.1.0-1
 - update to latest upstream version (1.1.0)