rpms/nspluginwrapper/devel nspluginwrapper-1.3.0-silent.patch, NONE, 1.1 nspluginwrapper-1.3.0-timeout.patch, NONE, 1.1 nspluginwrapper.spec, 1.87, 1.88
Martin Stransky
stransky at fedoraproject.org
Tue Jun 29 12:30:52 UTC 2010
Author: stransky
Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2791
Modified Files:
nspluginwrapper.spec
Added Files:
nspluginwrapper-1.3.0-silent.patch
nspluginwrapper-1.3.0-timeout.patch
Log Message:
- Changed RPM timeout to 10 second, should prevent
long browser hangs.
- Disabled debug outputs in normal build.
nspluginwrapper-1.3.0-silent.patch:
npw-player.c | 2 +-
npw-viewer.c | 4 ++--
npw-wrapper.c | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE nspluginwrapper-1.3.0-silent.patch ---
diff -up nspluginwrapper-1.3.0/src/npw-player.c.old nspluginwrapper-1.3.0/src/npw-player.c
--- nspluginwrapper-1.3.0/src/npw-player.c.old 2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/npw-player.c 2010-06-29 14:18:15.000000000 +0200
@@ -608,7 +608,7 @@ g_NPN_GetValue (NPP instance, NPNVariabl
*(PRBool *)value = USE_XEMBED;
break;
default:
- npw_printf ("WARNING: unhandled variable %d in NPN_GetValue()\n", variable);
+ D(bug("WARNING: unhandled variable %d in NPN_GetValue()\n", variable));
return NPERR_INVALID_PARAM;
}
diff -up nspluginwrapper-1.3.0/src/npw-viewer.c.old nspluginwrapper-1.3.0/src/npw-viewer.c
--- nspluginwrapper-1.3.0/src/npw-viewer.c.old 2010-05-21 10:01:24.000000000 +0200
+++ nspluginwrapper-1.3.0/src/npw-viewer.c 2010-06-29 14:21:07.000000000 +0200
@@ -1277,7 +1277,7 @@ g_NPN_GetValue(NPP instance, NPNVariable
}
break;
}
- npw_printf("WARNING: unhandled variable %d (%s) in NPN_GetValue()\n", variable, string_of_NPNVariable(variable));
+ D(bug("WARNING: unhandled variable %d (%s) in NPN_GetValue()\n", variable, string_of_NPNVariable(variable)));
return NPERR_INVALID_PARAM;
}
@@ -1563,7 +1563,7 @@ invoke_NPN_SetValue(PluginInstance *plug
case RPC_TYPE_BOOLEAN:
break;
default:
- npw_printf("WARNING: unhandled variable %d in NPN_SetValue()\n", variable);
+ D(bug("WARNING: unhandled variable %d in NPN_SetValue()\n", variable));
return NPERR_INVALID_PARAM;
}
diff -up nspluginwrapper-1.3.0/src/npw-wrapper.c.old nspluginwrapper-1.3.0/src/npw-wrapper.c
--- nspluginwrapper-1.3.0/src/npw-wrapper.c.old 2010-05-21 10:01:24.000000000 +0200
+++ nspluginwrapper-1.3.0/src/npw-wrapper.c 2010-06-29 14:20:33.000000000 +0200
@@ -2076,7 +2076,7 @@ g_NPP_GetValue(NPP instance, NPPVariable
case RPC_TYPE_NP_OBJECT:
break;
default:
- npw_printf("WARNING: unhandled variable %d in NPP_GetValue()\n", variable);
+ D(bug("WARNING: unhandled variable %d in NPP_GetValue()\n", variable));
return NPERR_INVALID_PARAM;
}
@@ -2471,7 +2471,7 @@ static void invoke_NPP_Print(PluginInsta
platformPrint = PrintInfo->print.embedPrint.platformPrint;
break;
default:
- npw_printf("WARNING: PrintInfo mode %d is not supported\n", PrintInfo->mode);
+ D(bug("WARNING: PrintInfo mode %d is not supported\n", PrintInfo->mode));
return;
}
uint32_t platform_print_id = 0;
@@ -2956,7 +2956,7 @@ g_LONG64_NPP_NewStream(NPP instance, NPM
// Detect broken 64-bit NPAPI
if (g_use_long64_thunks < 0) {
- npw_printf("WARNING: function using an NPStream was called too early, could not determine LONG64 data structure\n");
+ D(bug("WARNING: function using an NPStream was called too early, could not determine LONG64 data structure\n"));
set_use_long64_thunks(false);
}
nspluginwrapper-1.3.0-timeout.patch:
rpc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE nspluginwrapper-1.3.0-timeout.patch ---
diff -up nspluginwrapper-1.3.0/src/rpc.c.old nspluginwrapper-1.3.0/src/rpc.c
--- nspluginwrapper-1.3.0/src/rpc.c.old 2009-01-02 15:22:29.000000000 +0100
+++ nspluginwrapper-1.3.0/src/rpc.c 2010-06-29 14:24:39.000000000 +0200
@@ -68,7 +68,7 @@
// Define the maximum amount of time (in seconds) to wait for a message
#ifndef RPC_MESSAGE_TIMEOUT
-#define RPC_MESSAGE_TIMEOUT 30
+#define RPC_MESSAGE_TIMEOUT 10
#endif
// Define the maximum amount of time (in seconds) to wait for plugin connection
Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- nspluginwrapper.spec 28 Jun 2010 13:48:41 -0000 1.87
+++ nspluginwrapper.spec 29 Jun 2010 12:30:51 -0000 1.88
@@ -73,7 +73,7 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
Version: 1.3.0
-Release: 12%{?dist}
+Release: 13%{?dist}
Source0: http://gwenole.beauchesne.info/projects/nspluginwrapper/files/%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
Source1: %{plugin_config_name}.tar.gz
Source2: plugin-config.sh.in
@@ -85,6 +85,8 @@ Patch4: nspluginwrapper-20090625-fix-np
Patch5: nspluginwrapper-1.3.0-inst.patch
Patch6: nspluginwrapper-1.3.0-compiz.patch
Patch7: nspluginwrapper-1.3.0-comp.patch
+Patch8: nspluginwrapper-1.3.0-silent.patch
+Patch9: nspluginwrapper-1.3.0-timeout.patch
Patch100: plugin-config-setuid.patch
Patch101: plugin-config-umask.patch
Patch102: plugin-config-print.patch
@@ -122,6 +124,8 @@ This package consists in:
%patch5 -p1 -b .inst
%patch6 -p1 -b .compiz
%patch7 -p1 -b .comp
+%patch8 -p1 -b .silent
+%patch9 -p1 -b .timeout
# Plugin-config patches
pushd %plugin_config_name
@@ -254,6 +258,11 @@ fi;
%changelog
+* Tue Jun 29 2010 Martin Stransky <stransky at redhat.com> 1.3.0-13
+- Changed RPM timeout to 10 second, should prevent
+ long browser hangs.
+- Disabled debug outputs in normal build.
+
* Mon Jun 28 2010 Martin Stransky <stransky at redhat.com> 1.3.0-12
- Fixed rhbz#523273 - wrapped plugins not getting updated
More information about the scm-commits
mailing list