r35238 - in /desktop/unstable/vte3/debian: changelog patches/01_scroll_notebook.patch patches/03_scroll_region_updates.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu May 31 23:14:46 2012
New Revision: 35238

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35238
Log:
Refresh patches.

Modified:
    desktop/unstable/vte3/debian/changelog
    desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch
    desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch

Modified: desktop/unstable/vte3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/changelog?rev=35238&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte3/debian/changelog [utf-8] Thu May 31 23:14:46 2012
@@ -1,6 +1,7 @@
 vte3 (1:0.32.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 01 Jun 2012 01:12:36 +0200
 

Modified: desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch?rev=35238&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/01_scroll_notebook.patch [utf-8] Thu May 31 23:14:46 2012
@@ -4,11 +4,11 @@
 
 Corresponding GTK+ bug: GNOME #145244
 
-Index: vte-0.28.0/src/vte.c
+Index: vte-0.32.2/src/vte.c
 ===================================================================
---- vte-0.28.0.orig/src/vte.c	2011-06-05 01:48:33.224480856 +0200
-+++ vte-0.28.0/src/vte.c	2011-06-05 01:59:00.267546314 +0200
-@@ -11361,6 +11361,13 @@ vte_terminal_scroll(GtkWidget *widget, G
+--- vte-0.32.2.orig/src/vte.c	2012-05-29 19:44:17.000000000 +0200
++++ vte-0.32.2/src/vte.c	2012-06-01 01:13:26.527472012 +0200
+@@ -11387,6 +11387,13 @@
  
  	vte_terminal_read_modifiers (terminal, (GdkEvent*) event);
  

Modified: desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch?rev=35238&op=diff
==============================================================================
--- desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch [utf-8] (original)
+++ desktop/unstable/vte3/debian/patches/03_scroll_region_updates.patch [utf-8] Thu May 31 23:14:46 2012
@@ -2,11 +2,11 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=542087
 Bug-Ubuntu: https://launchpad.net/bugs/246701
 
-Index: vte3-exp/src/vte.c
+Index: vte-0.32.2/src/vte.c
 ===================================================================
---- vte3-exp.orig/src/vte.c	2012-03-21 10:44:08.880471453 +0100
-+++ vte3-exp/src/vte.c	2012-03-21 10:44:10.668471539 +0100
-@@ -4066,6 +4066,7 @@
+--- vte-0.32.2.orig/src/vte.c	2012-06-01 01:13:26.527472012 +0200
++++ vte-0.32.2/src/vte.c	2012-06-01 01:13:33.119471779 +0200
+@@ -4068,6 +4068,7 @@
  	long wcount, start, delta;
  	gboolean leftovers, modified, bottom, again;
  	gboolean invalidated_text;
@@ -14,7 +14,7 @@
  	GArray *unichars;
  	struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
  
-@@ -4085,6 +4086,10 @@
+@@ -4087,6 +4088,10 @@
  	cursor = screen->cursor_current;
  	cursor_visible = terminal->pvt->cursor_visible;
  
@@ -25,7 +25,7 @@
  	/* We should only be called when there's data to process. */
  	g_assert(terminal->pvt->incoming ||
  		 (terminal->pvt->pending->len > 0));
-@@ -4183,6 +4188,8 @@
+@@ -4185,6 +4190,8 @@
  		 * points to the first character which isn't part of this
  		 * sequence. */
  		if ((match != NULL) && (match[0] != '\0')) {
@@ -34,7 +34,7 @@
  			/* Call the right sequence handler for the requested
  			 * behavior. */
  			_vte_terminal_handle_sequence(terminal,
-@@ -4193,12 +4200,20 @@
+@@ -4195,12 +4202,20 @@
  			start = (next - wbuf);
  			modified = TRUE;
  
@@ -60,7 +60,7 @@
  				/* Clip off any part of the box which isn't already on-screen. */
  				bbox_topleft.x = MAX(bbox_topleft.x, 0);
  				bbox_topleft.y = MAX(bbox_topleft.y, delta);
-@@ -4218,6 +4233,8 @@
+@@ -4220,6 +4235,8 @@
  				bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
  				bbox_topleft.x = bbox_topleft.y = G_MAXINT;
  			}