summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-07-02 20:56:02 +0000
committerMike Frysinger <vapier@gentoo.org>2005-07-02 20:56:02 +0000
commit2c148c62d72cc9384ec8cab509c62afedede1a22 (patch)
treeb94db158578a73e1f8e10d7081ac1bc3bae47cec /sys-apps
parentFix bug #97081, and also a lingering unnoticed bug that isql++ was not always... (diff)
downloadgentoo-2-2c148c62d72cc9384ec8cab509c62afedede1a22.tar.gz
gentoo-2-2c148c62d72cc9384ec8cab509c62afedede1a22.tar.bz2
gentoo-2-2c148c62d72cc9384ec8cab509c62afedede1a22.zip
Touch up the jp106 map #71870 by OKUMURA N. Shin-ya.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/kbd/ChangeLog8
-rw-r--r--sys-apps/kbd/files/kbd-1.12-jp-escape.patch16
-rw-r--r--sys-apps/kbd/kbd-1.12-r5.ebuild5
3 files changed, 26 insertions, 3 deletions
diff --git a/sys-apps/kbd/ChangeLog b/sys-apps/kbd/ChangeLog
index 404b4180e4a5..6916a812c288 100644
--- a/sys-apps/kbd/ChangeLog
+++ b/sys-apps/kbd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/kbd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.37 2005/05/31 15:36:37 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/ChangeLog,v 1.38 2005/07/02 20:56:02 vapier Exp $
+
+ 02 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/kbd-1.12-jp-escape.patch, kbd-1.12-r5.ebuild:
+ Touch up the jp106 map #71870 by OKUMURA N. Shin-ya.
31 May 2005; Sven Wegener <swegener@gentoo.org> kbd-1.12-r3.ebuild,
kbd-1.12-r4.ebuild, kbd-1.12-r5.ebuild:
diff --git a/sys-apps/kbd/files/kbd-1.12-jp-escape.patch b/sys-apps/kbd/files/kbd-1.12-jp-escape.patch
new file mode 100644
index 000000000000..f413f0099083
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-1.12-jp-escape.patch
@@ -0,0 +1,16 @@
+Recognize Ctrl-[ as Escape.
+
+Patch by OKUMURA N. Shin-ya.
+
+http://bugs.gentoo.org/71870
+
+--- data/keymaps/i386/qwerty/jp106.map
++++ data/keymaps/i386/qwerty/jp106.map
+@@ -35,6 +35,7 @@
+ keycode 26 = at grave
+ control keycode 26 = nul
+ keycode 27 = bracketleft braceleft
++ control keycode 27 = Escape
+ keycode 28 = Return
+ alt keycode 28 = Meta_Control_m
+ keycode 29 = Control
diff --git a/sys-apps/kbd/kbd-1.12-r5.ebuild b/sys-apps/kbd/kbd-1.12-r5.ebuild
index 6f4d3f71185c..df858d98f3c8 100644
--- a/sys-apps/kbd/kbd-1.12-r5.ebuild
+++ b/sys-apps/kbd/kbd-1.12-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r5.ebuild,v 1.4 2005/07/02 17:44:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kbd/kbd-1.12-r5.ebuild,v 1.5 2005/07/02 20:56:02 vapier Exp $
inherit eutils toolchain-funcs
@@ -56,6 +56,9 @@ src_unpack() {
# The italian keymap is missing euro support #75970
epatch "${FILESDIR}"/${P}-it-euro-map.patch
+ # Fix jp map to recognize Ctrl-[ as Escape #71870
+ epatch "${FILESDIR}"/${P}-jp-escape.patch
+
# Patches from Fedora
epatch "${FILESDIR}"/${P}-Meta_utf8.patch
## Fix runtime with gcc4 (setfont: Input file: trailing garbage)