summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2007-07-27 13:43:34 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2007-07-27 13:43:34 +0000
commit8bfdcb87cc45fcf265b3a48e171861d833e8ffbe (patch)
treee7da4f7daf67e07a7cdb8a6b0b77e05f0c035828
parentRestore original ebuild since -r1 was for silc-toolkit, not for silc-client (diff)
downloadhistorical-8bfdcb87cc45fcf265b3a48e171861d833e8ffbe.tar.gz
historical-8bfdcb87cc45fcf265b3a48e171861d833e8ffbe.tar.bz2
historical-8bfdcb87cc45fcf265b3a48e171861d833e8ffbe.zip
Bump to 0.16.6-r1
Fix bug #178793: broken modifed cursor keys Package-Manager: portage-2.1.3_rc9
-rw-r--r--x11-libs/vte/ChangeLog9
-rw-r--r--x11-libs/vte/Manifest29
-rw-r--r--x11-libs/vte/files/digest-vte-0.16.6-r13
-rw-r--r--x11-libs/vte/files/vte-0.16.6-cursor-modifers-to-csi.patch89
-rw-r--r--x11-libs/vte/vte-0.16.6-r1.ebuild55
5 files changed, 180 insertions, 5 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/Manifest b/x11-libs/vte/Manifest
index 38d5b59e2bc6..20907f6d992d 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX vte-0.11.13-memory_fix.patch 7661 RMD160 f24d99c3b0ef9b094cc0c1b6913c03c4ec552168 SHA1 dbbdb2399fd22b20567d48fb6b0af4025a56c033 SHA256 65e0f6f6849b68904b4bf1231b88c04f7193a31365af77158e5cd5ed4cd398de
MD5 f8d6220ac03de9b337c4b0ec5243f55f files/vte-0.11.13-memory_fix.patch 7661
RMD160 f24d99c3b0ef9b094cc0c1b6913c03c4ec552168 files/vte-0.11.13-memory_fix.patch 7661
@@ -14,6 +17,10 @@ AUX vte-0.14.1-fbsd.patch 307 RMD160 4f819dbb3a7747a0a0098bedde4df42e5a70c455 SH
MD5 e83373da40e4db9abcae7baeb5e552c5 files/vte-0.14.1-fbsd.patch 307
RMD160 4f819dbb3a7747a0a0098bedde4df42e5a70c455 files/vte-0.14.1-fbsd.patch 307
SHA256 74c78bd7e66de69f967cdbb7f928386bba8121f516861092a0a20f467171168b files/vte-0.14.1-fbsd.patch 307
+AUX vte-0.16.6-cursor-modifers-to-csi.patch 2952 RMD160 10612b5c5d5740446f58481f81fe98c7707f0708 SHA1 b8651233385ddea224543059c24493f76eb49d5a SHA256 3dd98201544f5b20553797ca8133c6304b08dd18d0ae70f3277d591d73b908f1
+MD5 d7e738fd18b21ea0a9f11252a69844f1 files/vte-0.16.6-cursor-modifers-to-csi.patch 2952
+RMD160 10612b5c5d5740446f58481f81fe98c7707f0708 files/vte-0.16.6-cursor-modifers-to-csi.patch 2952
+SHA256 3dd98201544f5b20553797ca8133c6304b08dd18d0ae70f3277d591d73b908f1 files/vte-0.16.6-cursor-modifers-to-csi.patch 2952
AUX vte-line-scroll.patch 2234 RMD160 96dc248294da960119e6adb1012651803d9e0141 SHA1 bf3766828904091e778e1dcf6e15d52bdc97e7c0 SHA256 7b83355aa1b96afdd30506617614ec1e02de7dc81a170f1d1c702c99c2b9ab07
MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
RMD160 96dc248294da960119e6adb1012651803d9e0141 files/vte-line-scroll.patch 2234
@@ -48,14 +55,18 @@ EBUILD vte-0.16.5.ebuild 1198 RMD160 058913b3f240af544a02e9d5cf28fd2143537a49 SH
MD5 cb340e65584b5ac209959dd735a5f5b4 vte-0.16.5.ebuild 1198
RMD160 058913b3f240af544a02e9d5cf28fd2143537a49 vte-0.16.5.ebuild 1198
SHA256 4b0ee92f5908fbdbcc61d940a8b03b9f3b2675967d83a02c945a250eb8e90433 vte-0.16.5.ebuild 1198
+EBUILD vte-0.16.6-r1.ebuild 1299 RMD160 caa1bb7e0366907eadb9c597f1c00f412ecb7d2b SHA1 4c539eadf4cfb5b5022c0f51e67059cab18e8370 SHA256 541d9ba627405de25bedaea82ef8d4819a110174db63ec8a1cb05caf34f07768
+MD5 825ebbd6c11392a9b209f0b68f4dd925 vte-0.16.6-r1.ebuild 1299
+RMD160 caa1bb7e0366907eadb9c597f1c00f412ecb7d2b vte-0.16.6-r1.ebuild 1299
+SHA256 541d9ba627405de25bedaea82ef8d4819a110174db63ec8a1cb05caf34f07768 vte-0.16.6-r1.ebuild 1299
EBUILD vte-0.16.6.ebuild 1198 RMD160 aeec5b424ae0028fc154ee35efef13487f39d50e SHA1 16c64b8832a0a18e59018b82a27541703957b9bd SHA256 1bcdc99037f000c771fe74abba821618ee195f1b200e7c9f8744e3ccae96e857
MD5 ee2619b18979041ac461f684653255cf vte-0.16.6.ebuild 1198
RMD160 aeec5b424ae0028fc154ee35efef13487f39d50e vte-0.16.6.ebuild 1198
SHA256 1bcdc99037f000c771fe74abba821618ee195f1b200e7c9f8744e3ccae96e857 vte-0.16.6.ebuild 1198
-MISC ChangeLog 19582 RMD160 3fca91f8c22cef1dff55593b871868891b6cf007 SHA1 65169f89b661fa5a348d459ac56efa203917946c SHA256 e1e3af5414826870de772e8cd05a82d5fc9538bb18cee07a2b1c8a24c5a01e36
-MD5 28fb79422b094177e1f2bf208cd105d6 ChangeLog 19582
-RMD160 3fca91f8c22cef1dff55593b871868891b6cf007 ChangeLog 19582
-SHA256 e1e3af5414826870de772e8cd05a82d5fc9538bb18cee07a2b1c8a24c5a01e36 ChangeLog 19582
+MISC ChangeLog 19799 RMD160 b09ebfa2c385bd519a2a4967fc4e6411bf4289d5 SHA1 ef07fe0a18fe10fba060c8438fad4cd26260d7a7 SHA256 8397da92e44bd8f4b8539d2c8cab0cde6985d2b563292b23650ae3d6194e7646
+MD5 38653dbfe3152fec350cb283a31cd7c1 ChangeLog 19799
+RMD160 b09ebfa2c385bd519a2a4967fc4e6411bf4289d5 ChangeLog 19799
+SHA256 8397da92e44bd8f4b8539d2c8cab0cde6985d2b563292b23650ae3d6194e7646 ChangeLog 19799
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -78,3 +89,13 @@ SHA256 7d4f229daa8de8023c48977b02eafccdf6fa883502d36c72e5c3035b0160f924 files/di
MD5 276e83b41cfc4a28dbfb63d64145de2b files/digest-vte-0.16.6 238
RMD160 5969be86b5b4ea1668fe03163bf31684f02c5373 files/digest-vte-0.16.6 238
SHA256 1c24e1da5335b9c6c504f1e7c7492a62fbbcc443b4ecb993db3e92a54a18db46 files/digest-vte-0.16.6 238
+MD5 276e83b41cfc4a28dbfb63d64145de2b files/digest-vte-0.16.6-r1 238
+RMD160 5969be86b5b4ea1668fe03163bf31684f02c5373 files/digest-vte-0.16.6-r1 238
+SHA256 1c24e1da5335b9c6c504f1e7c7492a62fbbcc443b4ecb993db3e92a54a18db46 files/digest-vte-0.16.6-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGqfapomPajV0RnrERAisvAJ9m/9kPsZB06WKpYBuW2POkWAG8mgCdFgX4
+b6iA8K3zBIVsUKhmcdacHHo=
+=GNbU
+-----END PGP SIGNATURE-----
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
+}