Fix ascii null backspace in screen. bug #249618

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r4 x86_64

4 files changed, 119 insertions, 2 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index ad1e6666a7c7..bd779f9a2356 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.213 2008/11/13 19:04:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.214 2008/12/09 03:33:48 dang Exp $
+
+*vte-0.17.4-r3 (09 Dec 2008)
+
+  09 Dec 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/vte-0.17.4-no-null-backspace.patch, +vte-0.17.4-r3.ebuild:
+  - Fix ascii-null backspace in screen. Bug #249618
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> vte-0.16.14.ebuild:
   Marking vte-0.16.14 ppc64 stable for bug 236971
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 94cf4ca8d721..b2d14d2a0f72 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,5 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX vte-0.13.2-no-lazy-bindings.patch 356 RMD160 42555101f894ee6dea01cb792d4c631110f42150 SHA1 a21e7dd7e8aac7d7930f0501c303d53f6b7275d3 SHA256 7e666e1ea32cb99549218c77ffbc0ac73ed9d24c4885b02df676f6ecac458fce
 AUX vte-0.17.4-fix-highlighting-on-activity.patch 1536 RMD160 bd992b58360d082877039962dea019df7bc3fbfc SHA1 1ac3675bd937b734ebfaee04c6b56b389a0f5326 SHA256 a3ae37d0d8753a11058b9a0c3809d20384c6a5a74a1610ad89935465cb66c7c7
+AUX vte-0.17.4-no-null-backspace.patch 1704 RMD160 2c4292c7448a5ffafc10b17bde5ea3c3b0fc98b7 SHA1 8974de33ea0b80fb35c5f5658cfaff82f5fd2207 SHA256 89dffab495ad08af010e831e137f161471884ca8badc5051dae641c0c67e2742
 DIST vte-0.16.13.tar.bz2 1114585 RMD160 093e40ea7032b887cd1b12a97e060aeb8e8dd052 SHA1 5dc98cf5e2a5c96236ae8daa1bd53017e89adb71 SHA256 edfb74b0bef469ee122ab67c3e4562043e97803c8a32899caf5bd3a71c464a6d
 DIST vte-0.16.14.tar.bz2 1120379 RMD160 8ac4cc778ebbc0c2831692ca251bc50d5db8d4e8 SHA1 4d3ff513d4b0ebeb89babb284260b7fdc2dcd752 SHA256 40cf321980d3139c8f084e818504e1366be81bed817eeeec9021257e04c1c0db
 DIST vte-0.16.8.tar.bz2 1112410 RMD160 dc6a5b95596d02c5e55ecbb9e1e58bc64a02e9a8 SHA1 600db1aa27094aaf56241a1e2f8f0476f97ffd40 SHA256 1dc06ad4224c18061b000de0435b81b7c249215da4163edecb62a8d46090098f
@@ -8,6 +12,14 @@ EBUILD vte-0.16.13.ebuild 1250 RMD160 b732364627d8450797e2c9877d76ffa3211bbd21 S
 EBUILD vte-0.16.14.ebuild 1261 RMD160 b006532faa6f7695200420d212f44b87551a352d SHA1 43e6e091e962621ed1f4cbf3b45a980082d90e41 SHA256 c38d8aa13df03f2b921a5ec606138156121363438f2bffebdc764fa59e0d7279
 EBUILD vte-0.16.8.ebuild 1363 RMD160 ca7b33c1cc5ba8721cec64c406143e357126df00 SHA1 c5fceba04f78689d75c94d34a4f07cacaedb1468 SHA256 a6ea4ab4f15c625c49e6b868e75ad00cd901e4ae0f33f5b2f5d2adf2e720bdbe
 EBUILD vte-0.17.4-r2.ebuild 1170 RMD160 f957ed98a1b8689ecf831f38da4663cf30dc5e97 SHA1 3a8b7684a8f623e3e3efdded9502349b58bacbcc SHA256 6ef74c784a5b94800818189789fb7986c0a6deac9069cd1dade7228020f6cac3
+EBUILD vte-0.17.4-r3.ebuild 1236 RMD160 d1bf27646879ac1d8629f8cc4dfb87d9380e3f3e SHA1 3cb3cb48e4b914ac2faee093b0ba4b4a82bb07ea SHA256 ef46d7dc2004b5b75d50cdb07c8e25dc3a1a430b10511ce5d00f117460dfcedd
 EBUILD vte-0.17.4.ebuild 1060 RMD160 de9935f1f53cb2c98d4563d67cfc2df07ab8cb8d SHA1 f070abf4d8938f736e3aad5c259da712d182ad84 SHA256 747867f4c7877be838e7564a8c5db8e6340977a076f5c70bc1e2e9ead87ea0d5
-MISC ChangeLog 26777 RMD160 cbc6558f5a621f4898b4d6e1a702089668c10dbc SHA1 fe105eac7a15902b525d4ac2f6f8f8a96a9f008a SHA256 f8c44edcd4ffbd7a122b7a15b11c88179537358668ed0a035b1db88edc0c8362
+MISC ChangeLog 26977 RMD160 1baeb003907eb2353db233bd5d1f0887e623f1da SHA1 e516a15462dccacef6ed5c32d26c6d526428c831 SHA256 abccfa3591de52fd58bec46d487889a8944f7b2614ba9b6203fbdb4daba0a71c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iD8DBQFJPeciomPajV0RnrERAux1AJ9jNesS1E8b1PGnegvSMgPkoKRgdACfcHSH
+NSNu5WC+0Qq61P8vvUVJpyI=
+=OjQQ
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/vte/files/vte-0.17.4-no-null-backspace.patch b/x11-libs/vte/files/vte-0.17.4-no-null-backspace.patch
new file mode 100644
index 000000000000..734e7b530ce4
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.17.4-no-null-backspace.patch
@@ -0,0 +1,45 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN vte-0.17.4.orig/src/vte.c vte-0.17.4/src/vte.c
+--- vte-0.17.4.orig/src/vte.c	2008-09-08 15:48:31.000000000 -0400
++++ vte-0.17.4/src/vte.c	2008-12-08 22:22:38.000000000 -0500
+@@ -4636,6 +4636,7 @@ vte_terminal_key_press(GtkWidget *widget
+ 
+ 	/* Now figure out what to send to the child. */
+ 	if ((event->type == GDK_KEY_PRESS) && !modifier) {
++		cc_t erase = VTE_VDISABLE;
+ 		handled = FALSE;
+ 		/* Map the key to a sequence name if we can. */
+ 		switch (keyval) {
+@@ -4661,11 +4662,15 @@ vte_terminal_key_press(GtkWidget *widget
+ 				if (terminal->pvt->pty_master != -1) {
+ 					if (tcgetattr(terminal->pvt->pty_master,
+ 						      &tio) != -1) {
+-						normal = g_strdup_printf("%c",
+-									 tio.c_cc[VERASE]);
+ 						normal_length = 1;
++						erase = tio.c_cc[VERASE];
+ 					}
+ 				}
++				if (erase == VTE_VDISABLE)
++					normal = g_strdup(""); /* Fallback value. */
++				else
++					normal = g_strdup_printf("%c", erase);
++				normal_length = 1;
+ 				suppress_meta_esc = FALSE;
+ 				break;
+ 			}
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN vte-0.17.4.orig/src/vte-private.h vte-0.17.4/src/vte-private.h
+--- vte-0.17.4.orig/src/vte-private.h	2008-09-08 15:48:31.000000000 -0400
++++ vte-0.17.4/src/vte-private.h	2008-12-08 22:22:38.000000000 -0500
+@@ -91,6 +91,12 @@ G_BEGIN_DECLS
+ #define VTE_MAX_PROCESS_TIME		100
+ #define VTE_CELL_BBOX_SLACK		1
+ 
++#ifdef _POSIX_VDISABLE /* From unistd.h */
++#define VTE_VDISABLE			_POSIX_VDISABLE
++#else
++#define VTE_VDISABLE			'\0'
++#endif
++
+ /* The structure we use to hold characters we're supposed to display -- this
+  * includes any supported visible attributes. */
+ struct vte_charcell {
diff --git a/x11-libs/vte/vte-0.17.4-r3.ebuild b/x11-libs/vte/vte-0.17.4-r3.ebuild
new file mode 100644
index 000000000000..10328d7a0059
--- /dev/null
+++ b/x11-libs/vte/vte-0.17.4-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.17.4-r3.ebuild,v 1.1 2008/12/09 03:33:48 dang Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome terminal widget"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+# pcre is broken in this release
+IUSE="debug doc python opengl"
+
+RDEPEND=">=dev-libs/glib-2.14
+	>=x11-libs/gtk+-2.6
+	>=x11-libs/pango-1.1
+	>=media-libs/freetype-2.0.2
+	media-libs/fontconfig
+	sys-libs/ncurses
+	opengl? (
+		virtual/opengl
+		virtual/glu
+	)
+	python? (
+		>=dev-python/pygtk-2.4
+		>=dev-lang/python-2.4.4-r5
+	)
+	x11-libs/libX11
+	virtual/xft"
+
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.0 )
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable python)
+		$(use_with opengl glX)
+		--with-xft2 --with-pangox"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${P}-fix-highlighting-on-activity.patch"
+	# Bug #249618
+	epatch "${FILESDIR}/${P}-no-null-backspace.patch"
+}