summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2008-08-16 20:33:48 +0000
committerSven Wegener <swegener@gentoo.org>2008-08-16 20:33:48 +0000
commitafd109946d883cce1052a0344f14ab760254f77b (patch)
tree6edc9b2bf0eeff0714a59049730f38bb7c05849c /app-misc
parentUpstream requested package removal. (diff)
downloadgentoo-2-afd109946d883cce1052a0344f14ab760254f77b.tar.gz
gentoo-2-afd109946d883cce1052a0344f14ab760254f77b.tar.bz2
gentoo-2-afd109946d883cce1052a0344f14ab760254f77b.zip
Update map patch with the fix commited upstream.
(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc3-00277-g4ad193b x86_64)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/screen/ChangeLog6
-rw-r--r--app-misc/screen/files/screen-4.0.3_p20070403-map.patch27
2 files changed, 18 insertions, 15 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index d82694e9e399..731dbcd5cb3c 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/screen
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.140 2008/07/31 16:55:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.141 2008/08/16 20:33:47 swegener Exp $
+
+ 16 Aug 2008; Sven Wegener <swegener@gentoo.org>
+ files/screen-4.0.3_p20070403-map.patch:
+ Update map patch with the fix commited upstream.
31 Jul 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
Add USE flag description to metadata wrt GLEP 56.
diff --git a/app-misc/screen/files/screen-4.0.3_p20070403-map.patch b/app-misc/screen/files/screen-4.0.3_p20070403-map.patch
index 36d7162b87f1..13ce1192f93c 100644
--- a/app-misc/screen/files/screen-4.0.3_p20070403-map.patch
+++ b/app-misc/screen/files/screen-4.0.3_p20070403-map.patch
@@ -1,14 +1,13 @@
-diff -Nur screen-4.0.3_p20070403.orig/term.c screen-4.0.3_p20070403/term.c
---- screen-4.0.3_p20070403.orig/term.c 2005-12-16 18:51:07.000000000 +0000
-+++ screen-4.0.3_p20070403/term.c 2007-04-22 19:47:17.002355543 +0000
-@@ -230,8 +230,8 @@
- /* define T_NAVIGATE */
- { "kh", T_STR }, KMAPDEF("\033[1~") KMAPMDEF("\201")
- { "@1", T_STR },
-- { "kH", T_STR }, KMAPDEF("\033[4~") KMAPMDEF("\205")
-- { "@7", T_STR },
-+ { "kH", T_STR },
-+ { "@7", T_STR }, KMAPDEF("\033[4~") KMAPMDEF("\205")
- { "kN", T_STR }, KMAPDEF("\033[6~") KMAPMDEF("\006")
- { "kP", T_STR }, KMAPDEF("\033[5~") KMAPMDEF("\002")
- { "kI", T_STR }, KMAPDEF("\033[2~")
+diff --git a/src/termcap.c b/src/termcap.c
+index 01082cb..b96497d 100644
+--- a/src/termcap.c
++++ b/src/termcap.c
+@@ -548,8 +548,6 @@ int map;
+ else
+ break;
+ }
+- if (n < KMAP_KEYS)
+- domap = 1;
+ if (map == 0 && domap)
+ return 0;
+ if (map && !domap)