[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.5.1-2-6-gda10aac
Laurent Léonard
laurent at open-minds.org
Sat Mar 9 23:36:16 UTC 2013
The following commit has been merged in the master branch:
commit 6fbea51db92d6853be5186c3a7765ee5f059abea
Author: Laurent Léonard <laurent at open-minds.org>
Date: Sat Mar 9 23:30:10 2013 +0100
Drop patches
Fix-build-with-xulrunner-8.0.patch - fixed upstream https://git.gnome.org/browse/gtk-vnc/commit/?id=771ec347bb6d234746ccecd516a8847c336e6dd5
Use-C99-int-types-instead-of-NSPR-ones.patch - fixed upstream https://git.gnome.org/browse/gtk-vnc/commit/?id=771ec347bb6d234746ccecd516a8847c336e6dd5
fix-build-with-xulrunner-1.9.1.patch - fixed upstream https://git.gnome.org/browse/gtk-vnc/commit/?id=771ec347bb6d234746ccecd516a8847c336e6dd5
diff --git a/debian/patches/Fix-build-with-xulrunner-8.0.patch b/debian/patches/Fix-build-with-xulrunner-8.0.patch
deleted file mode 100644
index b5905b6..0000000
--- a/debian/patches/Fix-build-with-xulrunner-8.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 17 Nov 2011 21:04:30 +0100
-Subject: Fix build with xulrunner-8.0
-
----
- plugin/npshell.c | 4 ++--
- plugin/npunix.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugin/npshell.c b/plugin/npshell.c
-index ca4e78b..d8f826c 100644
---- a/plugin/npshell.c
-+++ b/plugin/npshell.c
-@@ -91,10 +91,10 @@
- *
- ***********************************************************************/
-
--char *
-+const char *
- NPP_GetMIMEDescription(void)
- {
-- return (char *) MIME_TYPES_HANDLED;
-+ return (const char *) MIME_TYPES_HANDLED;
- }
-
- NPError
-diff --git a/plugin/npunix.c b/plugin/npunix.c
-index 83ac628..54d8a41 100644
---- a/plugin/npunix.c
-+++ b/plugin/npunix.c
-@@ -537,7 +537,7 @@ Private_HandleEvent(NPP instance, void* event)
- * - Netscape uses the return value to identify when an object instance
- * of this plugin should be created.
- */
--char *
-+const char *
- NP_GetMIMEDescription(void)
- {
- return NPP_GetMIMEDescription();
diff --git a/debian/patches/Remove-GNUmakefile-links.patch b/debian/patches/Remove-GNUmakefile-links.patch
index 981087f..c35b3af 100644
--- a/debian/patches/Remove-GNUmakefile-links.patch
+++ b/debian/patches/Remove-GNUmakefile-links.patch
@@ -9,10 +9,10 @@ since it breaks the out of tree build
2 files changed, 22 deletions(-)
diff --git a/configure b/configure
-index f9383f2..f7af84f 100755
+index b335ce0..d8765e2 100755
--- a/configure
+++ b/configure
-@@ -11958,17 +11958,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -11971,17 +11971,6 @@ cat >>confdefs.h <<_ACEOF
#define VERSION_MICRO $VERSION_MICRO
_ACEOF
@@ -31,10 +31,10 @@ index f9383f2..f7af84f 100755
no) :
ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
diff --git a/configure.ac b/configure.ac
-index 21d7a02..f6a9946 100644
+index f7a17b8..5427f60 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -58,17 +58,6 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$VERSION_MAJOR], [Major version number of p
+@@ -56,17 +56,6 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$VERSION_MAJOR], [Major version number of p
AC_DEFINE_UNQUOTED([VERSION_MINOR], [$VERSION_MINOR], [Minor version number of package])
AC_DEFINE_UNQUOTED([VERSION_MICRO], [$VERSION_MICRO], [Micro version number of package])
diff --git a/debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch b/debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch
deleted file mode 100644
index b4544dc..0000000
--- a/debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From: Mike Hommey <glandium at debian.org>
-Date: Thu, 17 Nov 2011 08:52:05 +0100
-Subject: Use C99 int types instead of NSPR ones
-
-Closes: #631033
----
- plugin/gtk-vnc-plugin.c | 2 +-
- plugin/gtk-vnc-plugin.h | 8 ++++----
- plugin/npshell.c | 19 ++++++++++---------
- plugin/npunix.c | 10 +++++-----
- 4 files changed, 20 insertions(+), 19 deletions(-)
-
-diff --git a/plugin/gtk-vnc-plugin.c b/plugin/gtk-vnc-plugin.c
-index 1147a95..0aaf7c4 100644
---- a/plugin/gtk-vnc-plugin.c
-+++ b/plugin/gtk-vnc-plugin.c
-@@ -275,7 +275,7 @@ GtkVNCDestroyWindow (NPP instance)
-
- static NPWindow windowlessWindow;
-
--int16
-+int16_t
- GtkVNCXHandleEvent(NPP instance, void *event)
- {
- XGraphicsExposeEvent exposeEvent;
-diff --git a/plugin/gtk-vnc-plugin.h b/plugin/gtk-vnc-plugin.h
-index 4bf403e..0978fdb 100644
---- a/plugin/gtk-vnc-plugin.h
-+++ b/plugin/gtk-vnc-plugin.h
-@@ -45,10 +45,10 @@
- #define PLUGIN_DESCRIPTION "VNC (remote desktop) viewer plugin"
-
- typedef struct {
-- uint16 mode;
-+ uint16_t mode;
- NPWindow *window;
-- int32 x, y;
-- uint32 width, height;
-+ int32_t x, y;
-+ uint32_t width, height;
-
- NPP instance;
- NPBool pluginsHidden;
-@@ -61,7 +61,7 @@ typedef struct {
-
- extern NPError GtkVNCXSetWindow (NPP instance, NPWindow* window);
- extern NPError GtkVNCDestroyWindow (NPP instance);
--extern int16 GtkVNCXHandleEvent (NPP instance, void* event);
-+extern int16_t GtkVNCXHandleEvent (NPP instance, void* event);
-
- #ifdef ENABLE_DEBUG
- static inline void
-diff --git a/plugin/npshell.c b/plugin/npshell.c
-index df01b2e..ca4e78b 100644
---- a/plugin/npshell.c
-+++ b/plugin/npshell.c
-@@ -79,6 +79,7 @@
-
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
-
- #include <npapi.h>
-
-@@ -111,7 +112,7 @@ NPP_GetValue(NPP instance G_GNUC_UNUSED, NPPVariable variable, void *value)
- *((const char **)value) = PLUGIN_DESCRIPTION;
- break;
- case NPPVpluginNeedsXEmbed:
-- *((PRBool *)value) = PR_TRUE;
-+ *((NPBool *)value) = true;
- break;
- default:
- err = NPERR_GENERIC_ERROR;
-@@ -146,15 +147,15 @@ NPP_Shutdown(void)
- NPError
- NPP_New(NPMIMEType pluginType G_GNUC_UNUSED,
- NPP instance,
-- uint16 mode,
-- int16 argc,
-+ uint16_t mode,
-+ int16_t argc,
- char* argn[],
- char* argv[],
- NPSavedData *saved G_GNUC_UNUSED)
- {
- PluginInstance *This;
- NPError err = NPERR_NO_ERROR;
-- PRBool supportsXEmbed = PR_FALSE;
-+ NPBool supportsXEmbed = false;
- NPNToolkitType toolkit = 0;
- int i;
- char *key, *value;
-@@ -170,7 +171,7 @@ NPP_New(NPMIMEType pluginType G_GNUC_UNUSED,
- err = NPN_GetValue (instance,
- NPNVSupportsXEmbedBool,
- (void *)&supportsXEmbed);
-- if (err != NPERR_NO_ERROR || supportsXEmbed != PR_TRUE)
-+ if (err != NPERR_NO_ERROR || supportsXEmbed != true)
- return NPERR_INCOMPATIBLE_VERSION_ERROR;
-
- #if 1
-@@ -244,7 +245,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
- return GtkVNCXSetWindow(instance, window);
- }
-
--int32
-+int32_t
- NPP_WriteReady(NPP instance, NPStream *stream)
- {
- /*printf("NPP_WriteReady()\n");*/
-@@ -258,9 +259,9 @@ NPP_WriteReady(NPP instance, NPStream *stream)
- return -1L; /* don't accept any bytes in NPP_Write() */
- }
-
--int32
-+int32_t
- NPP_Write(NPP instance, NPStream *stream,
-- int32 offset G_GNUC_UNUSED, int32 len G_GNUC_UNUSED,
-+ int32_t offset G_GNUC_UNUSED, int32_t len G_GNUC_UNUSED,
- void *buffer G_GNUC_UNUSED)
- {
- /*printf("NPP_Write()\n");*/
-@@ -377,7 +378,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
- }
- }
-
--int16 NPP_HandleEvent(NPP instance, void* event)
-+int16_t NPP_HandleEvent(NPP instance, void* event)
- {
- /*printf("NPP_HandleEvent()\n");*/
-
-diff --git a/plugin/npunix.c b/plugin/npunix.c
-index 05eff4e..83ac628 100644
---- a/plugin/npunix.c
-+++ b/plugin/npunix.c
-@@ -305,7 +305,7 @@ NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
- type, window, stream_ptr);
- }
-
--int32
-+int32_t
- NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
- {
- return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
-@@ -439,7 +439,7 @@ Private_SetWindow(NPP instance, NPWindow* window)
- static NPError
- Private_NewStream(NPP instance G_GNUC_UNUSED, NPMIMEType type G_GNUC_UNUSED,
- NPStream* stream G_GNUC_UNUSED,
-- NPBool seekable G_GNUC_UNUSED, uint16* stype G_GNUC_UNUSED)
-+ NPBool seekable G_GNUC_UNUSED, uint16_t* stype G_GNUC_UNUSED)
- {
- NPError err = NPERR_NO_ERROR;
- PLUGINDEBUGSTR("NewStream");
-@@ -447,7 +447,7 @@ Private_NewStream(NPP instance G_GNUC_UNUSED, NPMIMEType type G_GNUC_UNUSED,
- return err;
- }
-
--static int32
-+static int32_t
- Private_WriteReady(NPP instance, NPStream* stream)
- {
- unsigned int result;
-@@ -456,7 +456,7 @@ Private_WriteReady(NPP instance, NPStream* stream)
- return result;
- }
-
--static int32
-+static int32_t
- Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
- void* buffer)
- {
-@@ -519,7 +519,7 @@ Private_GetJavaClass(void)
- }
- #endif
-
--static int16
-+static int16_t
- Private_HandleEvent(NPP instance, void* event)
- {
- return NPP_HandleEvent(instance, event);
diff --git a/debian/patches/fix-build-with-xulrunner-1.9.1.patch b/debian/patches/fix-build-with-xulrunner-1.9.1.patch
deleted file mode 100644
index 91807f4..0000000
--- a/debian/patches/fix-build-with-xulrunner-1.9.1.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Mon, 16 Nov 2009 21:48:41 +0100
-Subject: fix build with xulrunner 1.9.1
-
-Closes: #556840
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=564718
----
- plugin/npshell.c | 1 -
- plugin/npunix.c | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 168 insertions(+), 9 deletions(-)
-
-diff --git a/plugin/npshell.c b/plugin/npshell.c
-index c59bc89..df01b2e 100644
---- a/plugin/npshell.c
-+++ b/plugin/npshell.c
-@@ -81,7 +81,6 @@
- #include <string.h>
-
- #include <npapi.h>
--#include <npupp.h>
-
- #include "gtk-vnc-plugin.h"
-
-diff --git a/plugin/npunix.c b/plugin/npunix.c
-index fb80ea2..05eff4e 100644
---- a/plugin/npunix.c
-+++ b/plugin/npunix.c
-@@ -55,7 +55,151 @@
-
- #include <stdio.h>
- #include <npapi.h>
-+#if (((NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR) < 20)
- #include <npupp.h>
-+#else
-+#include <npfunctions.h>
-+// For 1.9 compatibility
-+// ------------------------------------------------
-+typedef NPError (*NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue);
-+#define NewNPN_GetValueProc(FUNC) \
-+ ((NPN_GetValueUPP) (FUNC))
-+#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \
-+ (*(FUNC))((ARG1), (ARG2), (ARG3))
-+
-+typedef NPError (*NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue);
-+#define NewNPN_SetValueProc(FUNC) \
-+ ((NPN_SetValueUPP) (FUNC))
-+#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \
-+ (*(FUNC))((ARG1), (ARG2), (ARG3))
-+
-+typedef NPError (*NPN_GetURLUPP)(NPP instance, const char* url, const char* window);
-+#define NewNPN_GetURLProc(FUNC) \
-+ ((NPN_GetURLUPP) (FUNC))
-+#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \
-+ (*(FUNC))((ARG1), (ARG2), (ARG3))
-+
-+typedef NPError (*NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData);
-+#define NewNPN_GetURLNotifyProc(FUNC) \
-+ ((NPN_GetURLNotifyUPP) (FUNC))
-+#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \
-+ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4))
-+
-+typedef NPError (*NPN_PostURLUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file);
-+#define NewNPN_PostURLProc(FUNC) \
-+ ((NPN_PostURLUPP) (FUNC))
-+#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \
-+ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6))
-+
-+typedef NPError (*NPN_PostURLNotifyUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData);
-+#define NewNPN_PostURLNotifyProc(FUNC) \
-+ ((NPN_PostURLNotifyUPP) (FUNC))
-+#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \
-+ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7))
-+
-+typedef NPError (*NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList);
-+#define NewNPN_RequestReadProc(FUNC) \
-+ ((NPN_RequestReadUPP) (FUNC))
-+#define CallNPN_RequestReadProc(FUNC, stream, range) \
-+ (*(FUNC))((stream), (range))
-+
-+typedef NPError (*NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
-+#define NewNPN_NewStreamProc(FUNC) \
-+ ((NPN_NewStreamUPP) (FUNC))
-+#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream) \
-+ (*(FUNC))((npp), (type), (window), (stream))
-+
-+typedef int32_t (*NPN_WriteUPP)(NPP instance, NPStream* stream, int32_t len, void* buffer);
-+#define NewNPN_WriteProc(FUNC) \
-+ ((NPN_WriteUPP) (FUNC))
-+#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer) \
-+ (*(FUNC))((npp), (stream), (len), (buffer))
-+
-+typedef NPError (*NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason);
-+#define NewNPN_DestroyStreamProc(FUNC) \
-+ ((NPN_DestroyStreamUPP) (FUNC))
-+#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason) \
-+ (*(FUNC))((npp), (stream), (reason))
-+
-+typedef void (*NPN_StatusUPP)(NPP instance, const char* message);
-+#define NewNPN_StatusProc(FUNC) \
-+ ((NPN_StatusUPP) (FUNC))
-+#define CallNPN_StatusProc(FUNC, npp, msg) \
-+ (*(FUNC))((npp), (msg))
-+
-+typedef const char* (*NPN_UserAgentUPP)(NPP instance);
-+#define NewNPN_UserAgentProc(FUNC) \
-+ ((NPN_UserAgentUPP) (FUNC))
-+#define CallNPN_UserAgentProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+typedef void* (*NPN_MemAllocUPP)(uint32_t size);
-+#define NewNPN_MemAllocProc(FUNC) \
-+ ((NPN_MemAllocUPP) (FUNC))
-+#define CallNPN_MemAllocProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+typedef void (*NPN_MemFreeUPP)(void* ptr);
-+#define NewNPN_MemFreeProc(FUNC) \
-+ ((NPN_MemFreeUPP) (FUNC))
-+#define CallNPN_MemFreeProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+typedef uint32_t (*NPN_MemFlushUPP)(uint32_t size);
-+#define NewNPN_MemFlushProc(FUNC) \
-+ ((NPN_MemFlushUPP) (FUNC))
-+#define CallNPN_MemFlushProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+typedef void (*NPN_ReloadPluginsUPP)(NPBool reloadPages);
-+#define NewNPN_ReloadPluginsProc(FUNC) \
-+ ((NPN_ReloadPluginsUPP) (FUNC))
-+#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+typedef void (*NPN_InvalidateRectUPP)(NPP instance, NPRect *rect);
-+#define NewNPN_InvalidateRectProc(FUNC) \
-+ ((NPN_InvalidateRectUPP) (FUNC))
-+#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \
-+ (*(FUNC))((ARG1), (ARG2))
-+
-+typedef void (*NPN_InvalidateRegionUPP)(NPP instance, NPRegion region);
-+#define NewNPN_InvalidateRegionProc(FUNC) \
-+ ((NPN_InvalidateRegionUPP) (FUNC))
-+#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \
-+ (*(FUNC))((ARG1), (ARG2))
-+
-+typedef void (*NPN_ForceRedrawUPP)(NPP instance);
-+#define NewNPN_ForceRedrawProc(FUNC) \
-+ ((NPN_ForceRedrawUPP) (FUNC))
-+#define CallNPN_ForceRedrawProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+typedef void* (*NPN_GetJavaEnvUPP)();
-+#define NewNPN_GetJavaEnvProc(FUNC) \
-+ ((NPN_GetJavaEnvUPP) (FUNC))
-+#define CallNPN_GetJavaEnvProc(FUNC) \
-+ (*(FUNC))()
-+
-+typedef void* (*NPN_GetJavaPeerUPP)(NPP instance);
-+#define NewNPN_GetJavaPeerProc(FUNC) \
-+ ((NPN_GetJavaPeerUPP) (FUNC))
-+#define CallNPN_GetJavaPeerProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+typedef bool (*NPN_PushPopupsEnabledStateUPP)(NPP instance, NPBool enabled);
-+#define NewNPN_PushPopupsEnabledStateProc(FUNC) \
-+ ((NPN_PushPopupsEnabledStateUPP) (FUNC))
-+#define CallNPN_PushPopupsEnabledStateProc(FUNC, ARG1, ARG2) \
-+ (*(FUNC))((ARG1), (ARG2))
-+
-+typedef bool (*NPN_PopPopupsEnabledStateUPP)(NPP instance);
-+#define NewNPN_PopPopupsEnabledStateProc(FUNC) \
-+ ((NPN_PopPopupsEnabledStateUPP) (FUNC))
-+#define CallNPN_PopPopupsEnabledStateProc(FUNC, ARG1) \
-+ (*(FUNC))((ARG1))
-+
-+#endif
-
- #include <glib.h> /* just for G_GNUC_UNUSED */
-
-@@ -132,14 +276,14 @@ NPN_GetURLNotify(NPP instance, const char* url, const char* window, void* notify
-
- NPError
- NPN_PostURL(NPP instance, const char* url, const char* window,
-- uint32 len, const char* buf, NPBool file)
-+ uint32_t len, const char* buf, NPBool file)
- {
- return CallNPN_PostURLProc(gNetscapeFuncs.posturl, instance,
- url, window, len, buf, file);
- }
-
- NPError
--NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len,
-+NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len,
- const char* buf, NPBool file, void* notifyData)
- {
- return CallNPN_PostURLNotifyProc(gNetscapeFuncs.posturlnotify,
-@@ -162,7 +306,7 @@ NPN_NewStream(NPP instance, NPMIMEType type, const char *window,
- }
-
- int32
--NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer)
-+NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
- {
- return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
- stream, len, buffer);
-@@ -188,7 +332,7 @@ NPN_UserAgent(NPP instance)
- }
-
- void*
--NPN_MemAlloc(uint32 size)
-+NPN_MemAlloc(uint32_t size)
- {
- return CallNPN_MemAllocProc(gNetscapeFuncs.memalloc, size);
- }
-@@ -198,7 +342,7 @@ void NPN_MemFree(void* ptr)
- CallNPN_MemFreeProc(gNetscapeFuncs.memfree, ptr);
- }
-
--uint32 NPN_MemFlush(uint32 size)
-+uint32_t NPN_MemFlush(uint32_t size)
- {
- return CallNPN_MemFlushProc(gNetscapeFuncs.memflush, size);
- }
-@@ -267,8 +411,8 @@ void NPN_PopPopupsEnabledState(NPP instance)
- ***********************************************************************/
-
- static NPError
--Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
-- int16 argc, char* argn[], char* argv[], NPSavedData* saved)
-+Private_New(NPMIMEType pluginType, NPP instance, uint16_t mode,
-+ int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
- {
- NPError ret;
- PLUGINDEBUGSTR("New");
-@@ -313,7 +457,7 @@ Private_WriteReady(NPP instance, NPStream* stream)
- }
-
- static int32
--Private_Write(NPP instance, NPStream* stream, int32 offset, int32 len,
-+Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
- void* buffer)
- {
- unsigned int result;
-@@ -499,6 +643,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
- */
- 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(Private_New);
- pluginFuncs->destroy = NewNPP_DestroyProc(Private_Destroy);
- pluginFuncs->setwindow = NewNPP_SetWindowProc(Private_SetWindow);
-@@ -511,6 +656,21 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
- pluginFuncs->urlnotify = NewNPP_URLNotifyProc(Private_URLNotify);
- pluginFuncs->getvalue = NewNPP_GetValueProc(Private_GetValue);
- pluginFuncs->event = NewNPP_HandleEventProc(Private_HandleEvent);
-+#else
-+ pluginFuncs->newp = (NPP_NewProcPtr)(Private_New);
-+ pluginFuncs->destroy = (NPP_DestroyProcPtr)(Private_Destroy);
-+ pluginFuncs->setwindow = (NPP_SetWindowProcPtr)(Private_SetWindow);
-+ pluginFuncs->newstream = (NPP_NewStreamProcPtr)(Private_NewStream);
-+ pluginFuncs->destroystream = (NPP_DestroyStreamProcPtr)(Private_DestroyStream);
-+ pluginFuncs->asfile = (NPP_StreamAsFileProcPtr)(Private_StreamAsFile);
-+ pluginFuncs->writeready = (NPP_WriteReadyProcPtr)(Private_WriteReady);
-+ pluginFuncs->write = (NPP_WriteProcPtr)(Private_Write);
-+ pluginFuncs->print = (NPP_PrintProcPtr)(Private_Print);
-+ pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify);
-+ pluginFuncs->getvalue = (NPP_GetValueProcPtr)(Private_GetValue);
-+ pluginFuncs->event = (NPP_HandleEventProcPtr)(Private_HandleEvent);
-+#endif
-+
- #ifdef OJI
- pluginFuncs->javaClass = Private_GetJavaClass();
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 1389ede..646147c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-fix-build-with-xulrunner-1.9.1.patch
-Use-C99-int-types-instead-of-NSPR-ones.patch
-Fix-build-with-xulrunner-8.0.patch
Remove-GNUmakefile-links.patch
--
libgtk-vnc Debian packaging
More information about the Pkg-libvirt-commits
mailing list