From ab1410d33401cf1fc4a384bb0b2d9901c8fe8d14 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 4 May 2011 12:59:20 +0000 Subject: Wed May 4 12:59:20 UTC 2011 --- multilib/nspluginwrapper/npw-viewer.c.patch | 13 -- ...rapper-20090625-fix-npident-array-sending.patch | 178 --------------------- 2 files changed, 191 deletions(-) delete mode 100644 multilib/nspluginwrapper/npw-viewer.c.patch delete mode 100644 multilib/nspluginwrapper/nspluginwrapper-20090625-fix-npident-array-sending.patch (limited to 'multilib') diff --git a/multilib/nspluginwrapper/npw-viewer.c.patch b/multilib/nspluginwrapper/npw-viewer.c.patch deleted file mode 100644 index a213003fd..000000000 --- a/multilib/nspluginwrapper/npw-viewer.c.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur nspluginwrapper-1.3.0.orig//src/npw-viewer.c nspluginwrapper-1.3.0//src/npw-viewer.c ---- nspluginwrapper-1.3.0.orig//src/npw-viewer.c 2009-01-02 15:22:29.000000000 +0100 -+++ nspluginwrapper-1.3.0//src/npw-viewer.c 2010-08-26 18:46:50.574976221 +0200 -@@ -4187,7 +4187,8 @@ - #define high_offset offsetof(struct _XtAppStruct, __maybe__input_max) - #define n_offsets_max (high_offset - low_offset)/2 - int i, ofs, n_offsets = 0; -- int offsets[n_offsets_max] = { 0, }; -+ int offsets[n_offsets_max]; -+ offsets[0] = 0; - - #define n_inputs_max 4 /* number of refinements/input sources */ - int fd, id, n_inputs = 0; diff --git a/multilib/nspluginwrapper/nspluginwrapper-20090625-fix-npident-array-sending.patch b/multilib/nspluginwrapper/nspluginwrapper-20090625-fix-npident-array-sending.patch deleted file mode 100644 index 568a4ea1f..000000000 --- a/multilib/nspluginwrapper/nspluginwrapper-20090625-fix-npident-array-sending.patch +++ /dev/null @@ -1,178 +0,0 @@ -Index: src/npw-viewer.c -=================================================================== ---- src/npw-viewer.c (revision 942) -+++ src/npw-viewer.c (working copy) -@@ -2059,7 +2059,7 @@ - RPC_METHOD_NPN_INVOKE, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, methodName, -+ RPC_TYPE_NP_IDENTIFIER, &methodName, - RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args, - RPC_TYPE_INVALID); - -@@ -2249,7 +2249,7 @@ - RPC_METHOD_NPN_GET_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2311,7 +2311,7 @@ - RPC_METHOD_NPN_SET_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_NP_VARIANT, value, - RPC_TYPE_INVALID); - -@@ -2370,7 +2370,7 @@ - RPC_METHOD_NPN_REMOVE_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2427,7 +2427,7 @@ - RPC_METHOD_NPN_HAS_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2484,7 +2484,7 @@ - RPC_METHOD_NPN_HAS_METHOD, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, methodName, -+ RPC_TYPE_NP_IDENTIFIER, &methodName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2780,7 +2780,7 @@ - - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPN_IDENTIFIER_IS_STRING, -- RPC_TYPE_NP_IDENTIFIER, identifier, -+ RPC_TYPE_NP_IDENTIFIER, &identifier, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2838,7 +2838,7 @@ - - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPN_UTF8_FROM_IDENTIFIER, -- RPC_TYPE_NP_IDENTIFIER, identifier, -+ RPC_TYPE_NP_IDENTIFIER, &identifier, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2902,7 +2902,7 @@ - - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPN_INT_FROM_IDENTIFIER, -- RPC_TYPE_NP_IDENTIFIER, identifier, -+ RPC_TYPE_NP_IDENTIFIER, &identifier, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -Index: src/npw-wrapper.c -=================================================================== ---- src/npw-wrapper.c (revision 942) -+++ src/npw-wrapper.c (working copy) -@@ -1528,7 +1528,7 @@ - free(name); - - return rpc_method_send_reply(connection, -- RPC_TYPE_NP_IDENTIFIER, ident, -+ RPC_TYPE_NP_IDENTIFIER, &ident, - RPC_TYPE_INVALID); - } - -@@ -1601,7 +1601,7 @@ - NPIdentifier ident = g_NPN_GetIntIdentifier(intid); - - return rpc_method_send_reply(connection, -- RPC_TYPE_NP_IDENTIFIER, ident, -+ RPC_TYPE_NP_IDENTIFIER, &ident, - RPC_TYPE_INVALID); - } - -Index: src/npruntime.c -=================================================================== ---- src/npruntime.c (revision 942) -+++ src/npruntime.c (working copy) -@@ -221,7 +221,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_HAS_METHOD, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -327,7 +327,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_INVOKE, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args, - RPC_TYPE_INVALID); - -@@ -509,7 +509,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_HAS_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -599,7 +599,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_GET_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -684,7 +684,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_SET_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_NP_VARIANT, value, - RPC_TYPE_INVALID); - -@@ -763,7 +763,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_REMOVE_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -Index: src/npw-rpc.c -=================================================================== ---- src/npw-rpc.c (revision 942) -+++ src/npw-rpc.c (working copy) -@@ -1252,7 +1252,7 @@ - // the browser side - static int do_send_NPIdentifier(rpc_message_t *message, void *p_value) - { -- NPIdentifier ident = (NPIdentifier)p_value; -+ NPIdentifier ident = *(NPIdentifier *)p_value; - int id = 0; - if (ident) { - #ifdef BUILD_WRAPPER -- cgit v1.2.3-54-g00ecf