[Pkg-libvirt-commits] [SCM] libgtk-vnc Debian packaging branch, master, updated. debian/0.5.0-3-5-g61e5796
Laurent Léonard
laurent at open-minds.org
Sun Jul 22 16:51:53 UTC 2012
The following commit has been merged in the master branch:
commit a0f640878cd3cb58f8bd2f2a2c5711e871311790
Author: Laurent Léonard <laurent at open-minds.org>
Date: Sun Jul 22 18:08:33 2012 +0200
Drop patch
Allow-Unix-domain-sockets-in-gvncviewer.patch - fixed upstream http://git.gnome.org/browse/gtk-vnc/commit/?id=078e3cffaab939151aa6afc2df08f7444f6db9ec
diff --git a/debian/patches/Allow-Unix-domain-sockets-in-gvncviewer.patch b/debian/patches/Allow-Unix-domain-sockets-in-gvncviewer.patch
deleted file mode 100644
index a505799..0000000
--- a/debian/patches/Allow-Unix-domain-sockets-in-gvncviewer.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date: Sat, 28 Jan 2012 20:14:32 +0100
-Subject: Allow Unix domain sockets in gvncviewer
-
-gvncviewer is useful when connecting to unix domain sockets.
----
- examples/gvncviewer.c | 48 +++++++++++++++++++++++++++++++++++++-----------
- 1 files changed, 37 insertions(+), 11 deletions(-)
-
-diff --git a/examples/gvncviewer.c b/examples/gvncviewer.c
-index 6d47d71..6730b33 100644
---- a/examples/gvncviewer.c
-+++ b/examples/gvncviewer.c
-@@ -30,6 +30,11 @@
- #include <stdlib.h>
- #include <string.h>
- #include <glib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <sys/socket.h>
-+#include <sys/un.h>
-
- #if WITH_LIBVIEW
- #include <libview/autoDrawer.h>
-@@ -586,6 +591,8 @@ int main(int argc, char **argv)
- GtkWidget *scaling;
- GtkWidget *showgrabkeydlg;
- const char *help_msg = "Run 'gvncviewer --help' to see a full list of available command line options";
-+ struct stat sockstat;
-+ int sock;
-
- name = g_strdup_printf("- Simple VNC Client on Gtk-VNC %s",
- vnc_util_get_version_string());
-@@ -688,17 +695,36 @@ int main(int argc, char **argv)
- gtk_widget_realize(vnc);
-
- snprintf(hostname, sizeof(hostname), "%s", args[0]);
-- display = strchr(hostname, ':');
--
-- if (display) {
-- *display = 0;
-- snprintf(port, sizeof(port), "%d", 5900 + atoi(display + 1));
-- } else
-- snprintf(port, sizeof(port), "%d", 5900);
--
-- if (!*hostname)
-- snprintf(hostname, sizeof(hostname), "%s", "127.0.0.1");
-- vnc_display_open_host(VNC_DISPLAY(vnc), hostname, port);
-+ if ((0 == stat(hostname, &sockstat)) &&
-+ S_ISSOCK(sockstat.st_mode)) {
-+ size_t sockaddrsize = offsetof(struct sockaddr_un, sun_path) + strlen(hostname) + 1;
-+ struct sockaddr_un* addr = malloc(sockaddrsize);
-+
-+ /* the argument refers to a unix domain socket */
-+ sock = socket(AF_UNIX, SOCK_STREAM, 0);
-+ addr->sun_family = AF_UNIX;
-+ strcpy(addr->sun_path, hostname);
-+ if (0 == connect(sock, (const struct sockaddr *)addr, sockaddrsize)) {
-+ vnc_display_open_fd(VNC_DISPLAY(vnc), sock);
-+ } else {
-+ fprintf(stderr, "Failed to open unix domain socket %s\n", hostname);
-+ return 1;
-+ }
-+ free(addr);
-+ } else {
-+ /* treat it as a regular hostname */
-+ display = strchr(hostname, ':');
-+
-+ if (display) {
-+ *display = 0;
-+ snprintf(port, sizeof(port), "%d", 5900 + atoi(display + 1));
-+ } else
-+ snprintf(port, sizeof(port), "%d", 5900);
-+
-+ if (!*hostname)
-+ snprintf(hostname, sizeof(hostname), "%s", "127.0.0.1");
-+ vnc_display_open_host(VNC_DISPLAY(vnc), hostname, port);
-+ }
- vnc_display_set_keyboard_grab(VNC_DISPLAY(vnc), TRUE);
- vnc_display_set_pointer_grab(VNC_DISPLAY(vnc), TRUE);
-
diff --git a/debian/patches/Look-for-generated-enums-in-srcdir.patch b/debian/patches/Look-for-generated-enums-in-srcdir.patch
index 8905ecc..1734597 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 df93cef..f9521a9 100644
+index 102a2e9..04050ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -331,7 +331,7 @@ GVNC_INTROSPECTION_SRCS = \
+@@ -350,7 +350,7 @@ GVNC_INTROSPECTION_SRCS = \
$(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
$(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
$(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
@@ -21,7 +21,7 @@ index df93cef..f9521a9 100644
$(srcdir)/vncutil.h $(srcdir)/vncutil.c
GVNCPULSE_INTROSPECTION_SRCS = \
-@@ -341,7 +341,7 @@ GTK_VNC_INTROSPECTION_SRCS = \
+@@ -360,7 +360,7 @@ GTK_VNC_INTROSPECTION_SRCS = \
$(srcdir)/vnccairoframebuffer.h $(srcdir)/vnccairoframebuffer.c \
$(srcdir)/vncdisplay.h $(srcdir)/vncdisplay.c \
$(srcdir)/vncgrabsequence.h $(srcdir)/vncgrabsequence.c \
@@ -31,10 +31,10 @@ index df93cef..f9521a9 100644
if HAVE_GTK_2
GTK_VNC_INTROSPECTION_SRCS += \
diff --git a/src/Makefile.in b/src/Makefile.in
-index bc91503..c34287b 100644
+index e2d9857..7b271ed 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -620,7 +620,7 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_12) \
+@@ -675,7 +675,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 \
@@ -43,7 +43,7 @@ index bc91503..c34287b 100644
@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
@WITH_GOBJECT_INTROSPECTION_TRUE at GVNCPULSE_INTROSPECTION_SRCS = \
-@@ -632,8 +632,8 @@ CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_12) \
+@@ -687,8 +687,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 \
diff --git a/debian/patches/Remove-GNUmakefile-links.patch b/debian/patches/Remove-GNUmakefile-links.patch
index 4be3441..981087f 100644
--- a/debian/patches/Remove-GNUmakefile-links.patch
+++ b/debian/patches/Remove-GNUmakefile-links.patch
@@ -6,13 +6,13 @@ since it breaks the out of tree build
---
configure | 11 -----------
configure.ac | 11 -----------
- 2 files changed, 0 insertions(+), 22 deletions(-)
+ 2 files changed, 22 deletions(-)
diff --git a/configure b/configure
-index 5a16507..ceb1bfc 100755
+index f9383f2..f7af84f 100755
--- a/configure
+++ b/configure
-@@ -11858,17 +11858,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -11958,17 +11958,6 @@ cat >>confdefs.h <<_ACEOF
#define VERSION_MICRO $VERSION_MICRO
_ACEOF
@@ -31,7 +31,7 @@ index 5a16507..ceb1bfc 100755
no) :
ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
diff --git a/configure.ac b/configure.ac
-index 8eebe41..9ef1dc7 100644
+index 21d7a02..f6a9946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,17 +58,6 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$VERSION_MAJOR], [Major version number of p
diff --git a/debian/patches/series b/debian/patches/series
index b44a562..252c851 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ Look-for-generated-enums-in-srcdir.patch
Use-C99-int-types-instead-of-NSPR-ones.patch
Fix-build-with-xulrunner-8.0.patch
Remove-GNUmakefile-links.patch
-Allow-Unix-domain-sockets-in-gvncviewer.patch
--
libgtk-vnc Debian packaging
More information about the Pkg-libvirt-commits
mailing list