r44012 - in /desktop/unstable/vte2.91/debian: changelog control patches/10_check_cursor_display.patch patches/11_cjk_ambiguous_width.patch patches/12_zombies.patch patches/13_zombies.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Dec 5 13:59:05 UTC 2014 

Author: joss
Date: Fri Dec  5 13:59:05 2014
New Revision: 44012

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44012
Log:
* Bug fixes from upstream git:
  + 10_check_cursor_display.patch: check the cursor’s display before 
    using it.
  + 11_cjk_ambiguous_width.patch: copy-paste bug in properties.
  + 12_zombies.patch, 13_zombies.patch: don’t leave zombie processes 
    around. Closes: #770596.

Added:
    desktop/unstable/vte2.91/debian/patches/10_check_cursor_display.patch
    desktop/unstable/vte2.91/debian/patches/11_cjk_ambiguous_width.patch
    desktop/unstable/vte2.91/debian/patches/12_zombies.patch
    desktop/unstable/vte2.91/debian/patches/13_zombies.patch
Modified:
    desktop/unstable/vte2.91/debian/changelog
    desktop/unstable/vte2.91/debian/control
    desktop/unstable/vte2.91/debian/patches/series

Modified: desktop/unstable/vte2.91/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/changelog?rev=44012&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/changelog	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/changelog	[utf-8] Fri Dec  5 13:59:05 2014
@@ -1,3 +1,14 @@
+vte2.91 (0.38.1-2) unstable; urgency=medium
+
+  * Bug fixes from upstream git:
+    + 10_check_cursor_display.patch: check the cursor’s display before 
+      using it.
+    + 11_cjk_ambiguous_width.patch: copy-paste bug in properties.
+    + 12_zombies.patch, 13_zombies.patch: don’t leave zombie processes 
+      around. Closes: #770596.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 05 Dec 2014 14:49:32 +0100
+
 vte2.91 (0.38.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/vte2.91/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/control?rev=44012&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/control	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/control	[utf-8] Fri Dec  5 13:59:05 2014
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.6
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 8),

Added: desktop/unstable/vte2.91/debian/patches/10_check_cursor_display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/10_check_cursor_display.patch?rev=44012&op=file
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/10_check_cursor_display.patch	(added)
+++ desktop/unstable/vte2.91/debian/patches/10_check_cursor_display.patch	[utf-8] Fri Dec  5 13:59:05 2014
@@ -0,0 +1,24 @@
+From 5cff499de0122b44d60c189ec138b2853af10a6c Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe at gnome.org>
+Date: Mon, 3 Nov 2014 18:38:30 +0100
+Subject: widget: Check cursor's display before using it
+
+(cherry picked from commit 19963440f9da89e2a3035c8a7488a92a244f22e3)
+
+diff --git a/src/vte.c b/src/vte.c
+index 9374fe6..28b7be9 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -1147,7 +1147,8 @@ vte_terminal_set_cursor_from_regex_match(VteTerminal *terminal, struct vte_match
+ 
+         switch (regex->cursor_mode) {
+                 case VTE_REGEX_CURSOR_GDKCURSOR:
+-                        if (regex->cursor.cursor != NULL) {
++                        if (regex->cursor.cursor != NULL &&
++                            gdk_cursor_get_display(regex->cursor.cursor) == gtk_widget_get_display(&terminal->widget)) {
+                                 cursor = g_object_ref(regex->cursor.cursor);
+                         }
+                         break;
+-- 
+cgit v0.10.1
+

Added: desktop/unstable/vte2.91/debian/patches/11_cjk_ambiguous_width.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/11_cjk_ambiguous_width.patch?rev=44012&op=file
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/11_cjk_ambiguous_width.patch	(added)
+++ desktop/unstable/vte2.91/debian/patches/11_cjk_ambiguous_width.patch	[utf-8] Fri Dec  5 13:59:05 2014
@@ -0,0 +1,23 @@
+From 102468e58fe48512ef100e439577d08c2ba4fb7f Mon Sep 17 00:00:00 2001
+From: Egmont Koblinger <egmont at gmail.com>
+Date: Sat, 22 Nov 2014 13:33:33 +0100
+Subject: widget: Fix installing the CJK ambiguous width property
+
+(cherry picked from commit 447266e2925527f898d3e9d048db7cecd2397cb7)
+
+diff --git a/src/vte.c b/src/vte.c
+index 28b7be9..c6172fc 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -11286,7 +11286,7 @@ vte_terminal_class_init(VteTerminalClass *klass)
+          */
+         g_object_class_install_property
+                 (gobject_class,
+-                 PROP_CURSOR_BLINK_MODE,
++                 PROP_CJK_AMBIGUOUS_WIDTH,
+                  g_param_spec_int ("cjk-ambiguous-width", NULL, NULL,
+                                    1, 2, VTE_ISO2022_DEFAULT_UTF8_AMBIGUOUS_WIDTH,
+                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
+-- 
+cgit v0.10.1
+

Added: desktop/unstable/vte2.91/debian/patches/12_zombies.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/12_zombies.patch?rev=44012&op=file
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/12_zombies.patch	(added)
+++ desktop/unstable/vte2.91/debian/patches/12_zombies.patch	[utf-8] Fri Dec  5 13:59:05 2014
@@ -0,0 +1,45 @@
+From d9d83d455a5b67fcce030c56fbd8de921dc3fa6d Mon Sep 17 00:00:00 2001
+From: Egmont Koblinger <egmont at gmail.com>
+Date: Mon, 1 Dec 2014 13:30:52 +0100
+Subject: widget: Do not leave behind a zombie child when closing a terminal
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740929
+(cherry picked from commit 31b150146189b49fadd126edc1c373ada234c865)
+
+diff --git a/src/vte.c b/src/vte.c
+index c6172fc..e5149c9 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -3210,6 +3210,12 @@ vte_terminal_child_watch_cb(GPid pid,
+                             int status,
+                             VteTerminal *terminal)
+ {
++	if (terminal == NULL) {
++		/* The child outlived VteTerminal. Do nothing, we're happy that Glib
++		 * read its exit data and hence it's no longer there as zombie. */
++		return;
++	}
++
+ 	if (pid == terminal->pvt->pty_pid) {
+                 GObject *object = G_OBJECT(terminal);
+ 
+@@ -8416,11 +8422,15 @@ vte_terminal_finalize(GObject *object)
+ 		terminal->pvt->outgoing_conv = VTE_INVALID_CONV;
+ 	}
+ 
+-	/* Stop listening for child-exited signals. */
++	/* Start listening for child-exited signals and ignore them, so that no zombie child is left behind. */
+         if (terminal->pvt->child_watch_source != 0) {
+                 g_source_remove (terminal->pvt->child_watch_source);
+                 terminal->pvt->child_watch_source = 0;
+         }
++        g_child_watch_add_full(G_PRIORITY_HIGH,
++                               terminal->pvt->pty_pid,
++                               (GChildWatchFunc)vte_terminal_child_watch_cb,
++                               NULL, NULL);
+ 
+ 	/* Stop processing input. */
+ 	vte_terminal_stop_processing (terminal);
+-- 
+cgit v0.10.1
+

Added: desktop/unstable/vte2.91/debian/patches/13_zombies.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/13_zombies.patch?rev=44012&op=file
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/13_zombies.patch	(added)
+++ desktop/unstable/vte2.91/debian/patches/13_zombies.patch	[utf-8] Fri Dec  5 13:59:05 2014
@@ -0,0 +1,31 @@
+From b033047970a7bb7e9e17c6e38ce5107daf704a7a Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Thu, 4 Dec 2014 16:46:00 +0100
+Subject: widget: Reap only when a child is present
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740929
+(cherry picked from commit 5f19e0b08cb06c76d989592e1a859ac3a23b8b4b)
+
+diff --git a/src/vte.c b/src/vte.c
+index e5149c9..5919416 100644
+--- a/src/vte.c
++++ b/src/vte.c
+@@ -8426,11 +8426,11 @@ vte_terminal_finalize(GObject *object)
+         if (terminal->pvt->child_watch_source != 0) {
+                 g_source_remove (terminal->pvt->child_watch_source);
+                 terminal->pvt->child_watch_source = 0;
++                g_child_watch_add_full(G_PRIORITY_HIGH,
++                                       terminal->pvt->pty_pid,
++                                       (GChildWatchFunc)vte_terminal_child_watch_cb,
++                                       NULL, NULL);
+         }
+-        g_child_watch_add_full(G_PRIORITY_HIGH,
+-                               terminal->pvt->pty_pid,
+-                               (GChildWatchFunc)vte_terminal_child_watch_cb,
+-                               NULL, NULL);
+ 
+ 	/* Stop processing input. */
+ 	vte_terminal_stop_processing (terminal);
+-- 
+cgit v0.10.1
+

Modified: desktop/unstable/vte2.91/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte2.91/debian/patches/series?rev=44012&op=diff
==============================================================================
--- desktop/unstable/vte2.91/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/vte2.91/debian/patches/series	[utf-8] Fri Dec  5 13:59:05 2014
@@ -1,2 +1,6 @@
 01_scroll_notebook.patch
+10_check_cursor_display.patch
+11_cjk_ambiguous_width.patch
+12_zombies.patch
+13_zombies.patch
 fix-out-of-tree-build.patch

More information about the pkg-gnome-commits mailing list