packages: xkeyboard-config/xkeyboard-config.spec, xkeyboard-config/xkeyboar...
draenog
draenog at pld-linux.org
Fri Jan 20 01:35:04 CET 2012
Author: draenog Date: Fri Jan 20 00:35:04 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- fix Shift+Fn
---- Files affected:
packages/xkeyboard-config:
xkeyboard-config.spec (1.39 -> 1.40) , xkeyboard-config-function-keys.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xkeyboard-config/xkeyboard-config.spec
diff -u packages/xkeyboard-config/xkeyboard-config.spec:1.39 packages/xkeyboard-config/xkeyboard-config.spec:1.40
--- packages/xkeyboard-config/xkeyboard-config.spec:1.39 Thu Jan 19 22:04:38 2012
+++ packages/xkeyboard-config/xkeyboard-config.spec Fri Jan 20 01:34:58 2012
@@ -9,6 +9,7 @@
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
# Source0-md5: 9f6d7a37fd192264a3ca07ede5d183c3
Patch0: %{name}-CVE-2012-0064.patch
+Patch1: %{name}-function-keys.patch
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -45,6 +46,7 @@
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__aclocal}
@@ -98,6 +100,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.40 2012/01/20 00:34:58 draenog
+- fix Shift+Fn
+
Revision 1.39 2012/01/19 21:04:38 draenog
- patch for screen-saver unlock via xkb debug key actions
================================================================
Index: packages/xkeyboard-config/xkeyboard-config-function-keys.patch
diff -u /dev/null packages/xkeyboard-config/xkeyboard-config-function-keys.patch:1.1
--- /dev/null Fri Jan 20 01:35:04 2012
+++ packages/xkeyboard-config/xkeyboard-config-function-keys.patch Fri Jan 20 01:34:58 2012
@@ -0,0 +1,214 @@
+commit 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d
+Author: Sergey V. Udaltsov <svu at gnome.org>
+Date: Wed Oct 5 22:26:26 2011 +0100
+
+ Levels 2-4 for CTRL+ALT are propagated from level 1
+
+diff --git a/symbols/keypad b/symbols/keypad
+index e85aaac..1bab391 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, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
++ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
+ };
+
+ // ClsGrb kills whichever client has a grab in effect
+ key <KPMU> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
++ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
+ };
+
+ // -VMode switches to the previous video mode
+ key <KPSU> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
++ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, 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, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
++ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, 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, 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 <KPDV> { [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / <XF86_Ungrab>
++ key <KPMU> { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
++ key <KPSU> { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
+
+- key <KPAD> { [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
++ key <KPAD> { [ KP_Add, KP_Add, KP_Add, KP_Add, 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, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
++ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, 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, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
++ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, 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, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
++ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, 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, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
++ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
+ };
+ };
+diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
+index 7d47d66..73b5af2 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, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
++ symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
+ };
+
+ // ClsGrb kills whichever client has a grab in effect
+ key <KPMU> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
++ symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
+ };
+
+ // -VMode switches to the previous video mode
+ key <KPSU> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
++ symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
+ };
+
+ // +VMode switches to the next video mode
+ key <KPAD> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode]
++ symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode]
+ };
+
+ };
+@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" {
+
+ key <FK01> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
++ symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ]
+ };
+
+ key <FK02> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
++ symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ]
+ };
+
+ key <FK03> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
++ symbols[Group1]= [ F3, F3, F3, F3, XF86_Switch_VT_3 ]
+ };
+
+ key <FK04> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
++ symbols[Group1]= [ F4, F4, F4, F4, XF86_Switch_VT_4 ]
+ };
+
+ key <FK05> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
++ symbols[Group1]= [ F5, F5, F5, F5, XF86_Switch_VT_5 ]
+ };
+
+ key <FK06> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
++ symbols[Group1]= [ F6, F6, F6, F6, XF86_Switch_VT_6 ]
+ };
+
+ key <FK07> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
++ symbols[Group1]= [ F7, F7, F7, F7, XF86_Switch_VT_7 ]
+ };
+
+ key <FK08> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
++ symbols[Group1]= [ F8, F8, F8, F8, XF86_Switch_VT_8 ]
+ };
+
+ key <FK09> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
++ symbols[Group1]= [ F9, F9, F9, F9, XF86_Switch_VT_9 ]
+ };
+
+ key <FK10> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
++ symbols[Group1]= [ F10, F10, F10, F10, XF86_Switch_VT_10 ]
+ };
+
+ key <FK11> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
++ symbols[Group1]= [ F11, F11, F11, F11, XF86_Switch_VT_11 ]
+ };
+
+ key <FK12> {
+ type="CTRL+ALT",
+- symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
++ symbols[Group1]= [ F12, F12, F12, F12, XF86_Switch_VT_12 ]
+ };
+
+ };
+diff --git a/symbols/terminate b/symbols/terminate
+index 96dd6e8..c74220b 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, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ]
++ symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ]
+ };
+ };
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xkeyboard-config/xkeyboard-config.spec?r1=1.39&r2=1.40&f=u
More information about the pld-cvs-commit
mailing list