Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c61378c5c93850dd0f786b0b1c6fc76574073e83
commit c61378c5c93850dd0f786b0b1c6fc76574073e83 Author: Melko <me...@frugalware.org> Date: Tue Dec 13 22:56:58 2011 +0100 xkeyboard-config-2.4-2-i686 * backport patch to fix SHIFT+BACKSPACE killing X diff --git a/source/x11/xkeyboard-config/0001-Fixing-keys-using-CTRL-ALT-type.patch b/source/x11/xkeyboard-config/0001-Fixing-keys-using-CTRL-ALT-type.patch new file mode 100644 index 0000000..ea686eb --- /dev/null +++ b/source/x11/xkeyboard-config/0001-Fixing-keys-using-CTRL-ALT-type.patch @@ -0,0 +1,150 @@ +From df82ed7d78316202b7ca66a8df9a7a6111cfedc7 Mon Sep 17 00:00:00 2001 +From: "Sergey V. Udaltsov" <s...@gnome.org> +Date: Sat, 1 Oct 2011 20:46:57 +0100 +Subject: [PATCH 01/18] Fixing keys using CTRL+ALT type + +https://bugs.freedesktop.org/show_bug.cgi?id=41297 +A number of keys used 2nd level for CTRL+ALT action, +now they are using level 5 +--- + symbols/keypad | 24 ++++++++++++------------ + symbols/srvr_ctrl | 8 ++++---- + symbols/terminate | 2 +- + 3 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/symbols/keypad b/symbols/keypad +index 40afe4f..e85aaac 100644 +--- a/symbols/keypad ++++ b/symbols/keypad +@@ -84,19 +84,19 @@ xkb_symbols "x11" { + // Ungrab cancels server/keyboard/pointer grabs + key <KPDV> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Divide, XF86_Ungrab ] ++ symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] + }; + + // ClsGrb kills whichever client has a grab in effect + key <KPMU> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Multiply, XF86_ClearGrab ] ++ symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] + }; + + // -VMode switches to the previous video mode + key <KPSU> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ] ++ symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] + }; + + key <KP7> { [ KP_Home, KP_7 ] }; +@@ -106,7 +106,7 @@ xkb_symbols "x11" { + // +VMode switches to the next video mode + key <KPAD> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Add, XF86_Next_VMode ] ++ symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] + }; + + key <KP4> { [ KP_Left, KP_4 ] }; +@@ -242,11 +242,11 @@ xkb_symbols "legacymath" { + + key.type[Group1]="CTRL+ALT" ; + +- key <KPDV> { [ KP_Divide, XF86_Ungrab ] }; // / <XF86_Ungrab> +- key <KPMU> { [ KP_Multiply, XF86_ClearGrab ] }; // * <XF86_ClearGrab> +- key <KPSU> { [ KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode> ++ key <KPDV> { [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / <XF86_Ungrab> ++ key <KPMU> { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * <XF86_ClearGrab> ++ key <KPSU> { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode> + +- key <KPAD> { [ KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode> ++ key <KPAD> { [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + <XF86_Next_VMode> + + }; + +@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" { + // ClsGrb kills whichever client has a grab in effect + key <KOMU> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Multiply, XF86_ClearGrab ] ++ symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] + }; + + key <KO4> { [ KP_4 ] }; +@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" { + // -VMode switches to the previous video mode + key <KOSU> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ] ++ symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] + }; + + key <KO1> { [ KP_1 ] }; +@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" { + // +VMode switches to the next video mode + key <KOAD> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Add, XF86_Next_VMode ] ++ symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] + }; + + key <KO0> { [ KP_0 ] }; +@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" { + // Ungrab cancels server/keyboard/pointer grabs + key <KODV> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Divide, XF86_Ungrab ] ++ symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] + }; + }; +diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl +index 8bdf503..7d47d66 100644 +--- a/symbols/srvr_ctrl ++++ b/symbols/srvr_ctrl +@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" { + // Ungrab cancels server/keyboard/pointer grabs + key <KPDV> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Divide, XF86_Ungrab ] ++ symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] + }; + + // ClsGrb kills whichever client has a grab in effect + key <KPMU> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Multiply, XF86_ClearGrab ] ++ symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] + }; + + // -VMode switches to the previous video mode + key <KPSU> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Subtract, XF86_Prev_VMode ] ++ symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] + }; + + // +VMode switches to the next video mode + key <KPAD> { + type="CTRL+ALT", +- symbols[Group1]= [ KP_Add, XF86_Next_VMode] ++ symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode] + }; + + }; +diff --git a/symbols/terminate b/symbols/terminate +index 343d24f..96dd6e8 100644 +--- a/symbols/terminate ++++ b/symbols/terminate +@@ -2,6 +2,6 @@ partial default modifier_keys + xkb_symbols "ctrl_alt_bksp" { + key <BKSP> { + type="CTRL+ALT", +- symbols[Group1] = [ NoSymbol, Terminate_Server ] ++ symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ] + }; + }; +-- +1.7.8 + diff --git a/source/x11/xkeyboard-config/FrugalBuild b/source/x11/xkeyboard-config/FrugalBuild index aea78e5..13acf1e 100644 --- a/source/x11/xkeyboard-config/FrugalBuild +++ b/source/x11/xkeyboard-config/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xkeyboard-config pkgver=2.4 -pkgrel=1 +pkgrel=2 pkgdesc="X.org XML-based XKB configuration registry" url="http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig"; groups=('x11' 'xorg-core' 'xorg-proto') @@ -11,8 +11,10 @@ depends=('xkbcomp>=1.0.5') archs=('i686' 'x86_64' 'ppc' 'arm') makedepends=('pkgconfig' 'perl-xml-parser' 'util-macros>=1.6.0' 'intltool') up2date=("Flasttar http://www.x.org/releases/individual/data/xkeyboard-config";) -source=(http://www.x.org/releases/individual/data/xkeyboard-config/$pkgname-$pkgver.tar.gz) -sha1sums=('ac7cdca397c86b579b6d3ef97d2e5a29ea172b94') +source=(http://www.x.org/releases/individual/data/xkeyboard-config/$pkgname-$pkgver.tar.gz \ + 0001-Fixing-keys-using-CTRL-ALT-type.patch) +sha1sums=('ac7cdca397c86b579b6d3ef97d2e5a29ea172b94' \ + '0351955d08e6ddec431c5051094014ea04218af3') build() { Fcd _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
