Changeset 7372

Timestamp:

02/13/11 23:22:51 (2 years ago)

Author:

alanbach-guest

Message:

• Refreshed 91_keep_fds.patch

Location:

pkg/raul/main/vte/trunk/debian

Files:

• changelog (modified) (1 diff)
• patches/91_keep_fds.patch (modified) (4 diffs)

pkg/raul/main/vte/trunk/debian/changelog

@@ -4 +4 @@
     - build-dep on dh-autoreconf and removed 90_autoreconf.patch
     - merged updates from Ubuntu
-
- -- Alan Baghumian <alan@technotux.org>  Sun, 13 Feb 2011 14:12:41 -0800
+    - refreshed 91_keep_fds.patch
+
+ -- Alan Baghumian <alan@technotux.org>  Sun, 13 Feb 2011 14:22:10 -0800
 
 vte (1:0.24.1-parsix1) unstable; urgency=low

pkg/raul/main/vte/trunk/debian/patches/91_keep_fds.patch

@@ -1 @@
-Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=320128
-Description: Keep file descriptors open on vte_fork_pty().
-
-Index: vte-0.25.91/src/pty.c
-===================================================================
---- vte-0.25.91.orig/src/pty.c  2010-09-07 16:57:59.842604001 +1000
-+++ vte-0.25.91/src/pty.c       2010-09-08 16:17:55.724088801 +1000
+diff -urN vte-0.26.2/src/pty.c vte-0.26.2.new//src/pty.c
+--- vte-0.26.2/src/pty.c        2010-10-18 06:58:58.000000000 -0700
++++ vte-0.26.2.new//src/pty.c   2011-02-13 14:21:18.250139673 -0800
 @@ -192,6 +192,7 @@
                 const char *name;
@@ -14 +10 @@
  
  /**
-@@ -332,6 +332,20 @@
+@@ -332,6 +333,20 @@
                 close(fd);
         }
@@ -35 +31 @@
          * weird things to them. */
         _vte_pty_reset_signal_handlers();
-@@ -437,6 +451,23 @@
+@@ -440,6 +455,23 @@
         return (gchar **) g_ptr_array_free (array, FALSE);
  }
@@ -59 +55 @@
   * __vte_pty_get_pty_flags:
   * @lastlog: %TRUE if the session should be logged to the lastlog
-@@ -520,6 +551,10 @@
+@@ -523,6 +555,10 @@
          /* add the given environment to the childs */
-         envp2 = __vte_pty_merge_environ (envv);
+         envp2 = __vte_pty_merge_environ (envv, pty->priv->term);
  
 +        pty->priv->child_setup_data.keep_fd = _vte_pty_keep_fd(envp2);