[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.5.0-1
Guido Günther
agx at sigxcpu.org
Thu Dec 22 19:28:43 UTC 2011
The following commit has been merged in the master branch:
commit 6b726760e8bebb24ee8f0127aac230f29bc9c60c
Author: Guido Günther <agx at sigxcpu.org>
Date: Wed Dec 21 21:58:05 2011 +0100
Update patches.
diff --git a/debian/patches/Fix-build-with-xulrunner-8.0.patch b/debian/patches/Fix-build-with-xulrunner-8.0.patch
index 01e7981..b5905b6 100644
--- a/debian/patches/Fix-build-with-xulrunner-8.0.patch
+++ b/debian/patches/Fix-build-with-xulrunner-8.0.patch
@@ -8,10 +8,10 @@ Subject: Fix build with xulrunner-8.0
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugin/npshell.c b/plugin/npshell.c
-index abdc338..b017fe7 100644
+index ca4e78b..d8f826c 100644
--- a/plugin/npshell.c
+++ b/plugin/npshell.c
-@@ -91,10 +91,10 @@ Contributor(s): Adobe Systems Incorporated.
+@@ -91,10 +91,10 @@
*
***********************************************************************/
@@ -25,7 +25,7 @@ index abdc338..b017fe7 100644
NPError
diff --git a/plugin/npunix.c b/plugin/npunix.c
-index 703d020..a7c6e68 100644
+index 83ac628..54d8a41 100644
--- a/plugin/npunix.c
+++ b/plugin/npunix.c
@@ -537,7 +537,7 @@ Private_HandleEvent(NPP instance, void* event)
@@ -37,4 +37,3 @@ index 703d020..a7c6e68 100644
NP_GetMIMEDescription(void)
{
return NPP_GetMIMEDescription();
---
diff --git a/debian/patches/Look-for-generated-enums-in-srcdir.patch b/debian/patches/Look-for-generated-enums-in-srcdir.patch
index 7f032c0..8905ecc 100644
--- a/debian/patches/Look-for-generated-enums-in-srcdir.patch
+++ b/debian/patches/Look-for-generated-enums-in-srcdir.patch
@@ -9,10 +9,10 @@ since this where they're being generated.
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
-index c5834cb..3dd6e0e 100644
+index df93cef..f9521a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -291,14 +291,14 @@ GVNC_INTROSPECTION_SRCS = \
+@@ -331,7 +331,7 @@ GVNC_INTROSPECTION_SRCS = \
$(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
$(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
$(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
@@ -20,7 +20,8 @@ index c5834cb..3dd6e0e 100644
+ $(srcdir)/vncconnectionenums.h $(srcdir)/vncconnectionenums.c \
$(srcdir)/vncutil.h $(srcdir)/vncutil.c
- GTK_VNC_INTROSPECTION_SRCS = \
+ GVNCPULSE_INTROSPECTION_SRCS = \
+@@ -341,7 +341,7 @@ GTK_VNC_INTROSPECTION_SRCS = \
$(srcdir)/vnccairoframebuffer.h $(srcdir)/vnccairoframebuffer.c \
$(srcdir)/vncdisplay.h $(srcdir)/vncdisplay.c \
$(srcdir)/vncgrabsequence.h $(srcdir)/vncgrabsequence.c \
@@ -30,10 +31,10 @@ index c5834cb..3dd6e0e 100644
if HAVE_GTK_2
GTK_VNC_INTROSPECTION_SRCS += \
diff --git a/src/Makefile.in b/src/Makefile.in
-index 274dc98..1ced6c8 100644
+index bc91503..c34287b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -548,7 +548,7 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \
+@@ -620,7 +620,7 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_12) \
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
@@ -41,8 +42,8 @@ index 274dc98..1ced6c8 100644
+ at WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncconnectionenums.h $(srcdir)/vncconnectionenums.c \
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
- @WITH_GOBJECT_INTROSPECTION_TRUE at GTK_VNC_INTROSPECTION_SRCS = $(srcdir)/vnccairoframebuffer.h \
-@@ -557,8 +557,8 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \
+ @WITH_GOBJECT_INTROSPECTION_TRUE at GVNCPULSE_INTROSPECTION_SRCS = \
+@@ -632,8 +632,8 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_12) \
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \
@@ -50,7 +51,6 @@ index 274dc98..1ced6c8 100644
- at WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \
+ at WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplayenums.h \
+ at WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplayenums.c \
- @WITH_GOBJECT_INTROSPECTION_TRUE@ $(am__append_14)
+ @WITH_GOBJECT_INTROSPECTION_TRUE@ $(am__append_15)
@G_IR_SCANNER_SYMBOL_PREFIX_FALSE@@WITH_GOBJECT_INTROSPECTION_TRUE at PREFIX_ARGS = --strip-prefix=Vnc
@G_IR_SCANNER_SYMBOL_PREFIX_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE at PREFIX_ARGS = --symbol-prefix=vnc --identifier-prefix=Vnc
---
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
index 7bbf271..b4544dc 100644
--- a/debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch
+++ b/debian/patches/Use-C99-int-types-instead-of-NSPR-ones.patch
@@ -11,7 +11,7 @@ Closes: #631033
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/plugin/gtk-vnc-plugin.c b/plugin/gtk-vnc-plugin.c
-index c5e5b53..8722ee5 100644
+index 1147a95..0aaf7c4 100644
--- a/plugin/gtk-vnc-plugin.c
+++ b/plugin/gtk-vnc-plugin.c
@@ -275,7 +275,7 @@ GtkVNCDestroyWindow (NPP instance)
@@ -22,25 +22,25 @@ index c5e5b53..8722ee5 100644
+int16_t
GtkVNCXHandleEvent(NPP instance, void *event)
{
- XGraphicsExposeEvent exposeEvent;
+ XGraphicsExposeEvent exposeEvent;
diff --git a/plugin/gtk-vnc-plugin.h b/plugin/gtk-vnc-plugin.h
-index e2113f6..9141853 100644
+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;
+- 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);
@@ -51,10 +51,10 @@ index e2113f6..9141853 100644
#ifdef ENABLE_DEBUG
static inline void
diff --git a/plugin/npshell.c b/plugin/npshell.c
-index e1194aa..abdc338 100644
+index df01b2e..ca4e78b 100644
--- a/plugin/npshell.c
+++ b/plugin/npshell.c
-@@ -79,6 +79,7 @@ Contributor(s): Adobe Systems Incorporated.
+@@ -79,6 +79,7 @@
#include <stdio.h>
#include <string.h>
@@ -121,7 +121,7 @@ index e1194aa..abdc338 100644
{
/*printf("NPP_Write()\n");*/
@@ -377,7 +378,7 @@ NPP_Print(NPP instance, NPPrint* printInfo)
- }
+ }
}
-int16 NPP_HandleEvent(NPP instance, void* event)
@@ -130,11 +130,11 @@ index e1194aa..abdc338 100644
/*printf("NPP_HandleEvent()\n");*/
diff --git a/plugin/npunix.c b/plugin/npunix.c
-index a9bdd88..703d020 100644
+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);
+ type, window, stream_ptr);
}
-int32
@@ -167,7 +167,7 @@ index a9bdd88..703d020 100644
-static int32
+static int32_t
Private_Write(NPP instance, NPStream* stream, int32_t offset, int32_t len,
- void* buffer)
+ void* buffer)
{
@@ -519,7 +519,7 @@ Private_GetJavaClass(void)
}
@@ -178,4 +178,3 @@ index a9bdd88..703d020 100644
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
index 06a2be7..91807f4 100644
--- a/debian/patches/fix-build-with-xulrunner-1.9.1.patch
+++ b/debian/patches/fix-build-with-xulrunner-1.9.1.patch
@@ -10,10 +10,10 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=564718
2 files changed, 168 insertions(+), 9 deletions(-)
diff --git a/plugin/npshell.c b/plugin/npshell.c
-index 0252a02..e1194aa 100644
+index c59bc89..df01b2e 100644
--- a/plugin/npshell.c
+++ b/plugin/npshell.c
-@@ -81,7 +81,6 @@ Contributor(s): Adobe Systems Incorporated.
+@@ -81,7 +81,6 @@
#include <string.h>
#include <npapi.h>
@@ -22,7 +22,7 @@ index 0252a02..e1194aa 100644
#include "gtk-vnc-plugin.h"
diff --git a/plugin/npunix.c b/plugin/npunix.c
-index 67a72f0..a9bdd88 100644
+index fb80ea2..05eff4e 100644
--- a/plugin/npunix.c
+++ b/plugin/npunix.c
@@ -55,7 +55,151 @@
@@ -181,11 +181,11 @@ index 67a72f0..a9bdd88 100644
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)
+- 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);
+ url, window, len, buf, file);
}
NPError
@@ -202,7 +202,7 @@ index 67a72f0..a9bdd88 100644
+NPN_Write(NPP instance, NPStream* stream, int32_t len, void* buffer)
{
return CallNPN_WriteProc(gNetscapeFuncs.write, instance,
- stream, len, buffer);
+ stream, len, buffer);
@@ -188,7 +332,7 @@ NPN_UserAgent(NPP instance)
}
@@ -226,9 +226,9 @@ index 67a72f0..a9bdd88 100644
static NPError
-Private_New(NPMIMEType pluginType, NPP instance, uint16 mode,
-- int16 argc, char* argn[], char* argv[], NPSavedData* saved)
+- 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)
++ int16_t argc, char* argn[], char* argv[], NPSavedData* saved)
{
NPError ret;
PLUGINDEBUGSTR("New");
@@ -238,7 +238,7 @@ index 67a72f0..a9bdd88 100644
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)
+ void* buffer)
{
unsigned int result;
@@ -499,6 +643,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
@@ -271,4 +271,3 @@ index 67a72f0..a9bdd88 100644
#ifdef OJI
pluginFuncs->javaClass = Private_GetJavaClass();
#endif
---
--
libgtk-vnc Debian packaging
More information about the Pkg-libvirt-commits
mailing list