diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/vte/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-libs/vte/files/digest-vte-0.16.6-r1 | 3 | ||||
| -rw-r--r-- | x11-libs/vte/files/vte-0.16.6-cursor-modifers-to-csi.patch | 89 | ||||
| -rw-r--r-- | x11-libs/vte/vte-0.16.6-r1.ebuild | 55 |
4 files changed, 155 insertions, 1 deletions
diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog index e9b3426480a4..c288a42be075 100644 --- a/x11-libs/vte/ChangeLog +++ b/x11-libs/vte/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/vte # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.159 2007/07/22 03:07:25 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.160 2007/07/27 13:43:34 dang Exp $ + +*vte-0.16.6-r1 (27 Jul 2007) + + 27 Jul 2007; Daniel Gryniewicz <dang@gentoo.org> + +files/vte-0.16.6-cursor-modifers-to-csi.patch, +vte-0.16.6-r1.ebuild: + Bump to 0.16.6-r1 + Fix bug #178793: broken modifed cursor keys 22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; vte-0.12.2.ebuild, vte-0.14.1.ebuild, vte-0.14.2.ebuild: diff --git a/x11-libs/vte/files/digest-vte-0.16.6-r1 b/x11-libs/vte/files/digest-vte-0.16.6-r1 new file mode 100644 index 000000000000..3b6c1fb7b2de --- /dev/null +++ b/x11-libs/vte/files/digest-vte-0.16.6-r1 @@ -0,0 +1,3 @@ +MD5 131174986ab519b91dfcd6cf22541cbb vte-0.16.6.tar.bz2 1103546 +RMD160 13b133c6005b31b1122f8891f89eae7e8bdff750 vte-0.16.6.tar.bz2 1103546 +SHA256 4832e53ab6ccdb1c7aee278b7dce0cb3602972c202a5c0e1726aa660e08e4a10 vte-0.16.6.tar.bz2 1103546 diff --git a/x11-libs/vte/files/vte-0.16.6-cursor-modifers-to-csi.patch b/x11-libs/vte/files/vte-0.16.6-cursor-modifers-to-csi.patch new file mode 100644 index 000000000000..8ed12d3720a7 --- /dev/null +++ b/x11-libs/vte/files/vte-0.16.6-cursor-modifers-to-csi.patch @@ -0,0 +1,89 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN vte-0.16.6.orig/src/keymap.c vte-0.16.6/src/keymap.c +--- vte-0.16.6.orig/src/keymap.c 2007-02-26 16:05:13.000000000 -0500 ++++ vte-0.16.6/src/keymap.c 2007-07-27 09:33:28.000000000 -0400 +@@ -1120,6 +1120,7 @@ _vte_keymap_map(guint keyval, + hp_mode, + legacy_mode, + vt220_mode, ++ cursor_mode & cursor_app, + normal, + normal_length); + _VTE_DEBUG_IF(VTE_DEBUG_KEYBOARD) { +@@ -1323,6 +1324,31 @@ _vte_keymap_key_gets_modifiers(guint key + return fkey; + } + ++/* Prior and Next are ommitted for the SS3 to CSI switch below */ ++gboolean ++is_cursor_key(guint keyval) ++{ ++ switch (keyval) { ++ case GDK_Home: ++ case GDK_Left: ++ case GDK_Up: ++ case GDK_Right: ++ case GDK_Down: ++ case GDK_End: ++ ++ case GDK_KP_Home: ++ case GDK_KP_Left: ++ case GDK_KP_Up: ++ case GDK_KP_Right: ++ case GDK_KP_Down: ++ case GDK_KP_End: ++ return TRUE; ++ default: ++ return FALSE; ++ } ++} ++ ++ + void + _vte_keymap_key_add_key_modifiers(guint keyval, + GdkModifierType modifiers, +@@ -1330,6 +1356,7 @@ _vte_keymap_key_add_key_modifiers(guint + gboolean hp_mode, + gboolean legacy_mode, + gboolean vt220_mode, ++ gboolean cursor_app_mode, + char **normal, + gssize *normal_length) + { +@@ -1386,6 +1413,15 @@ _vte_keymap_key_add_key_modifiers(guint + nnormal = g_malloc0(*normal_length + 4); + memcpy(nnormal, *normal, *normal_length); + if (strlen(nnormal) > 1) { ++ /* SS3 should have no modifiers so make it CSI instead. See ++ * http://cvsweb.xfree86.org/cvsweb/xc/programs/xterm/input.c.diff?r1=3.57&r2=3.58 ++ */ ++ if (cursor_app_mode && ++ g_str_has_prefix(nnormal, _VTE_CAP_SS3) ++ && is_cursor_key(keyval)) { ++ nnormal[1] = '['; ++ } ++ + /* Get the offset of the last character. */ + offset = strlen(nnormal) - 1; + if (g_ascii_isdigit(nnormal[offset - 1])) { +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN vte-0.16.6.orig/src/keymap.h vte-0.16.6/src/keymap.h +--- vte-0.16.6.orig/src/keymap.h 2007-02-26 16:05:13.000000000 -0500 ++++ vte-0.16.6/src/keymap.h 2007-07-27 09:33:28.000000000 -0400 +@@ -56,6 +56,7 @@ void _vte_keymap_key_add_key_modifiers(g + gboolean hp_mode, + gboolean legacy_mode, + gboolean vt220_mode, ++ gboolean app_cursor_keys, + char **normal, + gssize *normal_length); + +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN vte-0.16.6.orig/src/vte.c vte-0.16.6/src/vte.c +--- vte-0.16.6.orig/src/vte.c 2007-06-18 17:29:44.000000000 -0400 ++++ vte-0.16.6/src/vte.c 2007-07-27 09:33:28.000000000 -0400 +@@ -4447,6 +4447,7 @@ vte_terminal_key_press(GtkWidget *widget + terminal->pvt->hp_fkey_mode, + terminal->pvt->legacy_fkey_mode, + terminal->pvt->vt220_fkey_mode, ++ terminal->pvt->cursor_mode == VTE_KEYMODE_APPLICATION, + &normal, + &normal_length); + output = g_strdup_printf(normal, 1); diff --git a/x11-libs/vte/vte-0.16.6-r1.ebuild b/x11-libs/vte/vte-0.16.6-r1.ebuild new file mode 100644 index 000000000000..f10193c4a9f6 --- /dev/null +++ b/x11-libs/vte/vte-0.16.6-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.16.6-r1.ebuild,v 1.1 2007/07/27 13:43:34 dang Exp $ + +inherit eutils gnome2 autotools + +DESCRIPTION="Gnome terminal widget" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +# pcre is broken in this release +IUSE="debug doc python opengl" + +RDEPEND=">=dev-libs/glib-2.9 + >=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.2 + ) + 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="$(use_enable debug) $(use_enable python) \ + $(use_with opengl glX) --with-xft2 --with-pangox" +} + +src_unpack() { + gnome2_src_unpack + + # Fix modified cursor keys; bug #178793 + epatch "${FILESDIR}"/${P}-cursor-modifers-to-csi.patch + + epatch ${FILESDIR}/${PN}-0.13.2-no-lazy-bindings.patch + cd ${S}/gnome-pty-helper + eautomake +} |