diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-21 00:00:00 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2011-11-21 00:00:00 +0000 |
| commit | f802635c41028497ae1dc4fba16dd4ff68ab045f (patch) | |
| tree | bd6ae73c43b46824a67d4c3e18e297e15633af19 /x11-misc/xkeyboard-config | |
| parent | Fixed dodoc issue, bug #374811. Respect LDFLAGS, bug #334849. Clean up. (diff) | |
| download | gentoo-2-f802635c41028497ae1dc4fba16dd4ff68ab045f.tar.gz gentoo-2-f802635c41028497ae1dc4fba16dd4ff68ab045f.tar.bz2 gentoo-2-f802635c41028497ae1dc4fba16dd4ff68ab045f.zip | |
Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino.
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xkeyboard-config')
| -rw-r--r-- | x11-misc/xkeyboard-config/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch | 35 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild (renamed from x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r1.ebuild) | 3 |
3 files changed, 45 insertions, 2 deletions
diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog index 283827d96194..03475b9219b8 100644 --- a/x11-misc/xkeyboard-config/ChangeLog +++ b/x11-misc/xkeyboard-config/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-misc/xkeyboard-config # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.144 2011/10/14 22:07:52 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.145 2011/11/21 00:00:00 chithanh Exp $ + +*xkeyboard-config-2.4.1-r2 (20 Nov 2011) + + 20 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> + -xkeyboard-config-2.4.1-r1.ebuild, +xkeyboard-config-2.4.1-r2.ebuild, + +files/xkeyboard-config-2.4.1-shift-backspace.patch: + Add upstream patch to unbreak shift-backspace, bug #391061 by tetromino. *xkeyboard-config-2.4.1-r1 (14 Oct 2011) diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch new file mode 100644 index 000000000000..cfc5c3a6fcc8 --- /dev/null +++ b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch @@ -0,0 +1,35 @@ +From 81fc86a911b55481b9597bb9284b3beca460104c Mon Sep 17 00:00:00 2001 +From: Sergey V. Udaltsov <svu@gnome.org> +Date: Sun, 20 Nov 2011 20:03:26 +0000 +Subject: Extend BackSpace to the 2nd group + +https://bugs.freedesktop.org/show_bug.cgi?id=43098 +--- +diff --git a/symbols/pc b/symbols/pc +index e1965ce..7e13ecb 100644 +--- a/symbols/pc ++++ b/symbols/pc +@@ -14,7 +14,7 @@ xkb_symbols "pc105" { + include "pc(editing)" + include "keypad(x11)" + +- key <BKSP> { [ BackSpace ] }; ++ key <BKSP> { [ BackSpace, BackSpace ] }; + + key <TAB> { [ Tab, ISO_Left_Tab ] }; + key <RTRN> { [ Return ] }; +diff --git a/symbols/us b/symbols/us +index 1d8bdd0..7c3ee24 100644 +--- a/symbols/us ++++ b/symbols/us +@@ -573,7 +573,7 @@ xkb_symbols "dvp" { + key <AE10> { [ bracketright, 6 ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" }; + key <AE11> { [ exclam, 8, exclamdown ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" }; + key <AE12> { [ numbersign, grave, dead_grave ] }; +- key <BKSP> { [ BackSpace ] }; ++ key <BKSP> { [ BackSpace, BackSpace ] }; + + // upper row, left side + key <AD01> { [ semicolon, colon, dead_diaeresis ] }; +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild index 9de060ef9b02..033638e91174 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r1.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r1.ebuild,v 1.1 2011/10/14 22:07:52 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild,v 1.1 2011/11/21 00:00:00 chithanh Exp $ EAPI=4 @@ -36,6 +36,7 @@ XORG_CONFIGURE_OPTIONS=( PATCHES=( "${FILESDIR}"/${P}-extended-function-keys.patch + "${FILESDIR}"/${P}-shift-backspace.patch ) src_prepare() { |