[Pkg-libvirt-commits] [SCM] libgtk-vnc packaging branch, master, updated. debian/0.3.7-4-6-g76ea584

Guido Guenther agx at sigxcpu.org
Sat Jan 3 19:27:27 UTC 2009 

The following commit has been merged in the master branch:
commit a803bd0b5d7b364f42bb2b8f38b37a3aeda2544c
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Jan 3 18:30:30 2009 +0100

    drop patches fixed upstream
    
    * fix-bogus-screen-updates.diff
    * gtk-vnc-ungrab.diff
    * plugindir.diff

diff --git a/debian/patches/xulrunner-not-mozilla.diff b/debian/patches/0001-use-xulrunner-not-mozilla.patch
similarity index 59%
rename from debian/patches/xulrunner-not-mozilla.diff
rename to debian/patches/0001-use-xulrunner-not-mozilla.patch
index 8ed0f7e..5f0d4c5 100644
--- a/debian/patches/xulrunner-not-mozilla.diff
+++ b/debian/patches/0001-use-xulrunner-not-mozilla.patch
@@ -1,17 +1,26 @@
+From fbe6e6d81d41c547a20eac4f1580f45b0e6653ad Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 3 Jan 2009 18:25:03 +0100
+Subject: [PATCH] use xulrunner not mozilla
+
+---
+ configure.ac |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/configure.ac b/configure.ac
-index 6871585..96b9e6f 100644
+index b37a251..6f6c09e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -18,7 +18,7 @@
-
+@@ -15,7 +15,7 @@ PYTHON_REQUIRED=2.4
+ 
  NSPR_REQUIRED=4.0.0
  FIREFOX_PLUGIN_REQUIRED=2.0.0
 -MOZILLA_PLUGIN_REQUIRED=1.8
 +MOZILLA_PLUGIN_REQUIRED=1.0
-
-
+ 
+ 
  AC_CONFIG_HEADERS([config.h:config.hin])
-@@ -216,7 +216,7 @@ if test "x$enable_plugin" = "xyes"; then
+@@ -219,7 +219,7 @@ if test "x$enable_plugin" = "xyes"; then
      PKG_CHECK_MODULES(FIREFOX_PLUGIN,
                       firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED, ,[
          PKG_CHECK_MODULES(MOZILLA_PLUGIN,
@@ -20,3 +29,6 @@ index 6871585..96b9e6f 100644
          FIREFOX_PLUGIN_CFLAGS="$MOZILLA_PLUGIN_CFLAGS"
          FIREFOX_PLUGIN_LIBS="$MOZILLA_PLUGIN_LIBS"
      ])
+-- 
+1.6.0.3
+
diff --git a/debian/patches/fix-bogus-screen-updates.diff b/debian/patches/fix-bogus-screen-updates.diff
deleted file mode 100644
index 7b803d6..0000000
--- a/debian/patches/fix-bogus-screen-updates.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From: "Daniel P. Berrange" <berrange at redhat.com>
-To: gtk-vnc-devel <gtk-vnc-devel at lists.sourceforge.net>
-
-I just started randomly getting a X error when running against certain
-VNC servers. Eventually discovered that it was caused by a server 
-switching from relative to absolute mouse mode. This uses a psuedo
-encoding, unfortuntely our code was triggering a screen redraw on every
-frame buffer update message, not just the ones with framebuffer data.
-The absolute pointer message comes with x=1, y=0, w=800, h=600, which
-caused us to try and copy an 800 pixel client image to another 800 pixel
-image on the server, at an offset of 1,thus 1 pixel out of bounds.
-
-This patch avoids triggering updates for anything other than real fb
-updates
-
-Daniel
-
-diff --git a/src/gvnc.c b/src/gvnc.c
---- a/src/gvnc.c
-+++ b/src/gvnc.c
-@@ -1946,21 +1946,27 @@ static void gvnc_framebuffer_update(stru
- 	switch (etype) {
- 	case GVNC_ENCODING_RAW:
- 		gvnc_raw_update(gvnc, x, y, width, height);
-+		gvnc_update(gvnc, x, y, width, height);
- 		break;
- 	case GVNC_ENCODING_COPY_RECT:
- 		gvnc_copyrect_update(gvnc, x, y, width, height);
-+		gvnc_update(gvnc, x, y, width, height);
- 		break;
- 	case GVNC_ENCODING_RRE:
- 		gvnc_rre_update(gvnc, x, y, width, height);
-+		gvnc_update(gvnc, x, y, width, height);
- 		break;
- 	case GVNC_ENCODING_HEXTILE:
- 		gvnc_hextile_update(gvnc, x, y, width, height);
-+		gvnc_update(gvnc, x, y, width, height);
- 		break;
- 	case GVNC_ENCODING_ZRLE:
- 		gvnc_zrle_update(gvnc, x, y, width, height);
-+		gvnc_update(gvnc, x, y, width, height);
- 		break;
- 	case GVNC_ENCODING_TIGHT:
- 		gvnc_tight_update(gvnc, x, y, width, height);
-+		gvnc_update(gvnc, x, y, width, height);
- 		break;
- 	case GVNC_ENCODING_DESKTOP_RESIZE:
- 		gvnc_resize(gvnc, width, height);
-@@ -1986,8 +1992,6 @@ static void gvnc_framebuffer_update(stru
- 		gvnc->has_error = TRUE;
- 		break;
- 	}
--
--	gvnc_update(gvnc, x, y, width, height);
- }
- 
- gboolean gvnc_server_message(struct gvnc *gvnc)
-
-
diff --git a/debian/patches/gtk-vnc-ungrab.diff b/debian/patches/gtk-vnc-ungrab.diff
deleted file mode 100644
index d90e040..0000000
--- a/debian/patches/gtk-vnc-ungrab.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Daniel P. Berrange
-Hg: 1bae3a18e487
-
-The 0.3.7 release has a nasty bug where if the server transitions from
-relative pointer mode, to absolute pointer mode while the mouse grab is
-active, it'll never let you ungrab. Unfortunately this happens during
-boot of many VMs.
-
-The change causing this was this:
-
-changeset:   219:e7d57ece8227
-user:        Jonh Wendell <wendell at bani.com.br>
-date:        Thu May 29 15:51:23 2008 -0300
-files:       src/vncdisplay.c
-description:
-Ignore CTRL-ALT key combination if we are autograbbing and pointer is absolute
-
-The motivation was right, but we need to tweak its handling slightly, so 
-that it honours an ungrab request if the grab is currently active. The
-attached patch fixes this
-
-diff -r cf0e849385e0 src/vncdisplay.c
---- a/src/vncdisplay.c	Thu Sep 11 17:07:42 2008 +0100
-+++ b/src/vncdisplay.c	Wed Sep 24 20:56:01 2008 +0100
-@@ -703,13 +703,12 @@
- 		}
- 	}
- 
--	if ((!priv->grab_keyboard || !priv->absolute) &&
--	    key->type == GDK_KEY_PRESS &&
-+	if (key->type == GDK_KEY_PRESS &&
- 	    ((keyval == GDK_Control_L && (key->state & GDK_MOD1_MASK)) ||
- 	     (keyval == GDK_Alt_L && (key->state & GDK_CONTROL_MASK)))) {
- 		if (priv->in_pointer_grab)
- 			do_pointer_ungrab(VNC_DISPLAY(widget), FALSE);
--		else
-+		else if (!priv->grab_keyboard || !priv->absolute)
- 			do_pointer_grab(VNC_DISPLAY(widget), FALSE);
- 	}
- 
diff --git a/debian/patches/plugindir.diff b/debian/patches/plugindir.diff
deleted file mode 100644
index 0addc87..0000000
--- a/debian/patches/plugindir.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/plugin/Makefile.am b/plugin/Makefile.am
-index 813e879..58ed449 100644
---- a/plugin/Makefile.am
-+++ b/plugin/Makefile.am
-@@ -21,7 +21,7 @@ gtk-vnc-plugin.so: gtk-vnc-plugin.la
- 
- # Only leave the .so file in the plugins directory.
- install-data-hook:
--	rm -f $(plugindir)/gtk-vnc-plugin.a $(plugindir)/gtk-vnc-plugin.la
-+	rm -f $(DESTDIR)$(plugindir)/gtk-vnc-plugin.a $(DESTDIR)$(plugindir)/gtk-vnc-plugin.la
- 
- EXTRA_DIST = README
- 
diff --git a/debian/patches/series b/debian/patches/series
index 7d9e61e..7ca143d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-xulrunner-not-mozilla.diff
-plugindir.diff
-gtk-vnc-ungrab.diff
-fix-bogus-screen-updates.diff
+0001-use-xulrunner-not-mozilla.patch

-- 
libgtk-vnc packaging

More information about the Pkg-libvirt-commits mailing list