diff --git a/ibm_space_saver.diff b/ibm_space_saver.diff deleted file mode 100644 index 671ba00..0000000 --- a/ibm_space_saver.diff +++ /dev/null @@ -1,56 +0,0 @@ -Index: rules/base.lists.part -=================================================================== ---- rules/base.lists.part.orig -+++ rules/base.lists.part -@@ -73,6 +73,8 @@ - toshiba_s3000 trust trustda \ - unitekkb1925 yahoo - -+! $specialkbds = ibm_space_saver -+ - // all layouts with 3rd and 4th groups - ! $threelevellayouts = al az \ - be br bt \ -Index: rules/base.m_s.part -=================================================================== ---- rules/base.m_s.part.orig -+++ rules/base.m_s.part -@@ -1,4 +1,5 @@ - a4techKB21 = +inet(media_nav_common) -+ $specialkbds = +group(%m) - a4techKBS8 = +inet(media_nav_acpi_common) - a4_rfkb23 = +inet(media_nav_acpi_common) - asus_laptop = +inet(media_common) -Index: rules/base.xml.in -=================================================================== ---- rules/base.xml.in.orig -+++ rules/base.xml.in -@@ -1051,6 +1051,12 @@ - - - -+ ibm_space_saver -+ <_description>IBM Space Saver -+ -+ -+ -+ - macintosh - <_description>Macintosh - Apple -Index: symbols/group -=================================================================== ---- symbols/group.orig -+++ symbols/group -@@ -352,6 +352,11 @@ xkb_symbols "rctrl_toggle" { - }; - }; - -+// Override broken Numlock key on some IBM keyboards -+partial -+xkb_symbols "ibm_space_saver" { -+ key { [ Num_Lock, Num_Lock ] }; -+}; - // using the group(alt_caps_toggle) map, pressing: - // Alt+Caps Lock toggles group - // Caps Lock toggles caps lock diff --git a/microsoftnek4k-keycodes.diff b/microsoftnek4k-keycodes.diff deleted file mode 100644 index 4dddc6f..0000000 --- a/microsoftnek4k-keycodes.diff +++ /dev/null @@ -1,48 +0,0 @@ -Index: keycodes/nek4k -=================================================================== ---- keycodes/nek4k.orig -+++ keycodes/nek4k -@@ -2,10 +2,10 @@ default xkb_keycodes "nek4k" { - - = 180; - = 225; -- = 223; -+ = 163; - -- = 191; -- = 192; -+ // = 191; -+ // = 192; - - = 166; - = 167; -@@ -21,13 +21,13 @@ default xkb_keycodes "nek4k" { - - = 148; - --alias = ; -+//alias = ; - -- = 218; -- = 219; -- = 220; -- = 221; -- = 222; -+ = 192; -+ = 193; -+ = 194; -+ = 195; -+ = 196; - - = 146; - = 139; -@@ -39,7 +39,7 @@ alias = ; - = 240; - = 241; - = 239; -- = 193; -+ // = 193; - = 242; --alias = ; -+//alias = ; - }; diff --git a/microsoftnek4k-symbols.diff b/microsoftnek4k-symbols.diff deleted file mode 100644 index 15e0ceb..0000000 --- a/microsoftnek4k-symbols.diff +++ /dev/null @@ -1,75 +0,0 @@ -Index: symbols/inet -=================================================================== ---- symbols/inet.orig -+++ symbols/inet -@@ -1410,37 +1410,39 @@ xkb_symbols "microsoftmult" { - // Microsoft Natural Ergonomic Keyboard 4000 - partial alphanumeric_keys - xkb_symbols "microsoftnek4k" { -- key { [ XF86WWW ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -- key { [ XF86Documents ] }; -+ key { [ XF86WWW ] }; -+ key { [ Find ] }; -+ key { [ XF86Mail ] }; -+ key { [ XF86ZoomIn ] }; -+ key { [ XF86ZoomOut ] }; -+ key { [ XF86AudioPrev ] }; -+ key { [ XF86AudioNext ] }; -+ key { [ equal ] }; -+ key { [ parenleft ] }; -+ key { [ parenright ] }; -+ key { [ XF86AudioMute ] }; -+ key { [ XF86AudioRaiseVolume ]}; -+ key { [ XF86AudioLowerVolume ]}; -+ key { [ XF86AudioPlay ] }; -+ key { [ XF86Calculator] }; -+ key { [ XF86Launch1 ] }; -+ key { [ XF86Launch2 ] }; -+ key { [ XF86Launch3 ] }; -+ key { [ XF86Launch4 ] }; -+ key { [ XF86Launch5 ] }; -+ key { [ Help ] }; -+ key { [ Undo ] }; -+ key { [ Redo ] }; -+ key { [ XF86New ] }; -+ key { [ XF86Open ] }; -+ key { [ XF86Close ] }; -+ key { [ XF86Reply ] }; -+ key { [ XF86MailForward ] }; -+ key { [ XF86Send ] }; -+ key { [ XF86Spell ] }; -+ key { [ XF86Save ] }; -+ key { [ XF86Favorites ] }; -+ key { [ Print ] }; - }; - - // Oretec diff --git a/microsoftnek4k.diff b/microsoftnek4k.diff deleted file mode 100644 index 0d90f69..0000000 --- a/microsoftnek4k.diff +++ /dev/null @@ -1,222 +0,0 @@ -Index: geometry/microsoft -=================================================================== ---- geometry/microsoft.orig -+++ geometry/microsoft -@@ -530,3 +530,43 @@ xkb_geometry "elite" { - alias = ; - alias = ; - }; -+ -+xkb_geometry "nek4k" { -+ -+ // Approximate layout for a Microsoft Natural Keyboard -+ description= "Microsoft Natural Ergonomic Keyboard 4000"; -+ width= 500; -+ height= 260; -+ -+ shape.cornerRadius= 1; -+ shape "ZOOM" { { [ 16,15] } }; -+ shape "MUL1" { { [ 22,10] } }; -+ shape "MUL2" { { [ 20,10] } }; -+ shape "MUL3" { { [ 26,10] } }; -+ shape "DIR" { { [ 17,15] } }; -+ shape "LDEF" { { [ 18,18] }, { [2,1], [15,16] } }; -+ shape "FUNC" { { [ 18,15] }, { [3,1], [15,10] } }; -+ shape "TABK" { { [ 36,18] }, { [3,1], [34,16] } }; -+ shape "CAPS" { { [ 37,18] }, { [3,1], [33,16] } }; -+ shape "LFSH" { { [ 23,18] }, { [3,1], [21,16] } }; -+ shape "KEY~" { { [ 28,18] }, { [3,1], [25,15] } }; -+ shape "KEY6" { { [ 20,18] }, { [2,1], [16,16] } }; -+ shape "KEYB" { { [ 19,18] }, { [2,1], [15,16] } }; -+ shape "KEYT" { { [ 30,18] }, { [2,1], [26,16] } }; -+ shape "KEYG" { { [ 26,18] }, { [2,1], [22,16] } }; -+ shape "LCTL" { -+ approx= { [ 33, 21 ] }, -+ { [ 0, 0], [ 33, 0 ], [ 33, 25 ], [ 0, 18 ] }, -+ { [ 2, 1], [ 30, 1 ], [ 30, 20 ], [ 2, 15 ] } -+ }; -+ shape "LWIN" { -+ approx= { [ 26, 26 ] }, -+ { [ 0, 0], [ 26, 0 ], [ 26, 28 ], [ 0, 25 ] }, -+ { [ 2, 1], [ 23, 1 ], [ 23, 23 ], [ 2, 21 ] } -+ }; -+ shape "LALT" { -+ approx= { [ 27, 29 ] }, -+ { [ 0, 0], [ 27, 0 ], [ 27, 30 ], [ 0, 28 ] }, -+ { [ 2, 1], [ 24, 1 ], [ 24, 26 ], [ 2, 24 ] } -+ }; -+}; -Index: keycodes/Makefile.am -=================================================================== ---- keycodes/Makefile.am.orig -+++ keycodes/Makefile.am -@@ -12,6 +12,7 @@ fujitsu \ - hp \ - ibm \ - macintosh \ -+nek4k \ - sony \ - sun \ - xfree86 \ -Index: keycodes/nek4k -=================================================================== ---- /dev/null -+++ keycodes/nek4k -@@ -0,0 +1,45 @@ -+default xkb_keycodes "nek4k" { -+ -+ = 180; -+ = 225; -+ = 223; -+ -+ = 191; -+ = 192; -+ -+ = 166; -+ = 167; -+ -+ = 125; -+ = 187; -+ = 188; -+ -+ = 121; -+ = 122; -+ = 123; -+ = 172; -+ -+ = 148; -+ -+alias = ; -+ -+ = 218; -+ = 219; -+ = 220; -+ = 221; -+ = 222; -+ -+ = 146; -+ = 139; -+ = 190; -+ = 189; -+ = 142; -+ -+ = 214; -+ = 240; -+ = 241; -+ = 239; -+ = 193; -+ = 242; -+alias = ; -+}; -Index: rules/base.xml.in -=================================================================== ---- rules/base.xml.in.orig -+++ rules/base.xml.in -@@ -876,6 +876,13 @@ - - - -+ microsoftnek4k -+ <_description>Microsoft Natural Ergonomic Keyboard 4000 -+ Microsoft Inc. -+ -+ -+ -+ - oretec - <_description>Ortek MCK-800 MM/Internet keyboard - Ortek -Index: symbols/inet -=================================================================== ---- symbols/inet.orig -+++ symbols/inet -@@ -1423,6 +1423,42 @@ xkb_symbols "microsoftmult" { - }; - - -+// Microsoft Natural Ergonomic Keyboard 4000 -+partial alphanumeric_keys -+xkb_symbols "microsoftnek4k" { -+ key { [ XF86WWW ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+ key { [ XF86Documents ] }; -+}; -+ - // Oretec - - // Oretec MCK-800 MM/Internet keyboard -Index: keycodes/Makefile.in -=================================================================== ---- keycodes/Makefile.in.orig -+++ keycodes/Makefile.in -@@ -243,6 +243,7 @@ fujitsu \ - hp \ - ibm \ - macintosh \ -+nek4k \ - sony \ - sun \ - xfree86 \ -Index: rules/base.lists.part -=================================================================== ---- rules/base.lists.part.orig -+++ rules/base.lists.part -@@ -60,6 +60,7 @@ - logidinovo logidinovoedge \ - microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \ - microsoftoffice microsoftmult \ -+ microsoftnek4k \ - mx1998 mx2500 mx2750 \ - oretec \ - pc105 \ -Index: rules/base.m_g.part -=================================================================== ---- rules/base.m_g.part.orig -+++ rules/base.m_g.part -@@ -1,5 +1,6 @@ - microsoftelite = microsoft(elite) - $msmodels = microsoft(natural) -+ microsoftnek4k = microsoft(nek4k) - dell101 = dell(dell101) - dellm65 = dell(dellm65) - latitude = dell(latitude) -Index: rules/base.m_k.part -=================================================================== ---- rules/base.m_k.part.orig -+++ rules/base.m_k.part -@@ -6,6 +6,7 @@ - sun6 = sun(type6_usb) - sun6euro = sun(type6tuv_usb) - pc98 = xfree98(pc98) -+ microsoftnek4k = evdev+nek4k(nek4k) - $applealu = macintosh(alukbd) - macintosh_hhk = macintosh(hhk) - macintosh_old = macintosh(old) diff --git a/p_suse.diff b/p_suse.diff index d974e54..a0dd6cf 100644 --- a/p_suse.diff +++ b/p_suse.diff @@ -1,3 +1,5 @@ +- Add Multi_key to Control_R to get compose.Index: xkeyboard-config-2.1/rules/evdev.m_s.part + Index: symbols/pc =================================================================== --- symbols/pc.orig @@ -14,3 +16,16 @@ Index: symbols/pc key { [ Menu ] }; +- Add Support ctrl-alt-backspace Server Termination. + +Index: xkeyboard-config-2.1/rules/evdev.m_s.part +=================================================================== +--- rules/evdev.m_s.part ++++ rules/evdev.m_s.part +@@ -1,3 +1,3 @@ +- $evdevkbds = +inet(evdev)+inet(%m) +- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) +- * = +inet(evdev) ++ $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp) ++ applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp) ++ * = +inet(evdev)+terminate(ctrl_alt_bksp) diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 0c0a12a..0ac10dd 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Mon May 23 21:51:17 UTC 2011 - eich@suse.de + +- remove xkeyboard-config.inet.patch: + * There is an entry for KP_Equal in inet(apple) already: + key { [ KP_Equal ] }; + With the macintosh keycodes has the same value as + in the xfree86 keycodes file (i.e. 157). + +------------------------------------------------------------------- +Mon May 23 21:05:24 UTC 2011 - eich@suse.de + +- place all SUSE specific patches into one file: + * add Multi_key for compose. + * add ctrl-alt-backspace server termination key sequence. + +------------------------------------------------------------------- +Mon May 23 18:52:44 UTC 2011 - eich@suse.de + +- remove xkeyboard-config.macintosh.patch: + This can be handled by adding: + altwin:swap_lalt_lwin,lv3:alt_switch + as option for instance to the keyboard mappings for macintosh. + The xorg-x11 package will be updated accordingly. + +------------------------------------------------------------------- +Mon May 23 18:33:23 UTC 2011 - eich@suse.de + +- Remove xkeyboard-config.inet.microsoftpro.patch: + This patch is bogus and not needed for evedev keyboards any + more. + For old style keyboard +inet(microsoftprousb) specified the + augmentation used for a specific keyboard model. This this + keyboard model should be set instead ie: + setxkbmap -rules base -model microsfortprousb -layout -option "" + produces the same results as: + setxkbmap -rules base -model pc104 -layout -option inet:microsoftpro + (disregarding the geometry part which is rather irrelevant here). + +------------------------------------------------------------------- +Mon May 23 17:31:03 UTC 2011 - eich@suse.de + +- IBM Space Saver keyboard support was added upstream with + commit b69a8bd. + +------------------------------------------------------------------- +Mon May 23 15:32:30 UTC 2011 - eich@suse.de + +- Remove special handling for the microsoftnek4k + keyboard. This is handled correctly in evdev + already. + ------------------------------------------------------------------- Thu Apr 7 08:35:16 UTC 2011 - fcrozat@novell.com diff --git a/xkeyboard-config.ctrl_alt_bksp.patch b/xkeyboard-config.ctrl_alt_bksp.patch deleted file mode 100644 index e9538a6..0000000 --- a/xkeyboard-config.ctrl_alt_bksp.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: xkeyboard-config-2.1/rules/evdev.m_s.part -=================================================================== ---- xkeyboard-config-2.1.orig/rules/evdev.m_s.part -+++ xkeyboard-config-2.1/rules/evdev.m_s.part -@@ -1,3 +1,3 @@ -- $evdevkbds = +inet(evdev)+inet(%m) -- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) -- * = +inet(evdev) -+ $evdevkbds = +inet(evdev)+inet(%m)+terminate(ctrl_alt_bksp) -+ applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys)+terminate(ctrl_alt_bksp) -+ * = +inet(evdev)+terminate(ctrl_alt_bksp) diff --git a/xkeyboard-config.inet.microsoftpro.patch b/xkeyboard-config.inet.microsoftpro.patch deleted file mode 100644 index 36b810b..0000000 --- a/xkeyboard-config.inet.microsoftpro.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: rules/base.o_s.part -=================================================================== ---- rules/base.o_s.part.orig -+++ rules/base.o_s.part -@@ -112,6 +112,9 @@ - esperanto:qwerty = +epo(qwerty) - esperanto:dvorak = +epo(dvorak) - terminate:ctrl_alt_bksp = +terminate(ctrl_alt_bksp) -+ inet:microsoftpro = +inet(microsoftprousb) -+ inet:media_common = +inet(media_common) -+ inet:nav_common = +inet(nav_common) - keypad:pointerkeys = +keypad(pointerkeys) - apple:alupckeys = +macintosh_vndr/apple(alupckeys) - shift:both_capslock = +shift(both_capslock) diff --git a/xkeyboard-config.inet.patch b/xkeyboard-config.inet.patch deleted file mode 100644 index e1b602c..0000000 --- a/xkeyboard-config.inet.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: symbols/inet -=================================================================== ---- symbols/inet.orig -+++ symbols/inet -@@ -1708,6 +1708,7 @@ xkb_symbols "apple" { - key { [ XF86Launch1 ] }; - key { [ XF86Launch2 ] }; - key { [ XF86PowerOff ] }; -+ key { [ KP_Equal ] }; - key { [ F13 ] }; - key { [ F14 ] }; - key { [ F15 ] }; diff --git a/xkeyboard-config.macintosh.patch b/xkeyboard-config.macintosh.patch deleted file mode 100644 index aeb67d9..0000000 --- a/xkeyboard-config.macintosh.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.freedesktop.org/show_bug.cgi?id=8660 -handle the left contrl/option/apple keys properly. -apple+tab switches window -alt+e gives euro, alt+l gives @, etc - -================================================================================ -Index: rules/base.ml_s.part -=================================================================== ---- rules/base.ml_s.part.orig -+++ rules/base.ml_s.part -@@ -28,7 +28,7 @@ - $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l%(v) - $applealu * = macintosh_vndr/apple(alukbd)+%l%(v) - $macs en_US = pc+macintosh_vndr/us(extended) -- $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v) -+ $macs $macvendorlayouts = pc+macintosh_vndr/%l%(v)+altwin(swap_lalt_lwin)+level3(alt_switch) - nokiarx44 * = nokia_vndr/rx-44(%l) - nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) - nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v) -Index: rules/base.ml1_s.part -=================================================================== ---- rules/base.ml1_s.part.orig -+++ rules/base.ml1_s.part -@@ -8,7 +8,7 @@ - applealu_jis us = macintosh_vndr/apple(alukbd)+macintosh_vndr/jp(usmac) - $applealu $macvendorlayouts = macintosh_vndr/apple(alukbd)+macintosh_vndr/%l[1]%(v[1]) - $applealu * = macintosh_vndr/apple(alukbd)+%l[1]%(v[1]) -- $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1]) -+ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])+altwin(swap_lalt_lwin)+level3(alt_switch) - nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty) - nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1]) - $thinkpads br = pc+%l[1](thinkpad) diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 0ef1ab7..0cac2c7 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -31,17 +31,9 @@ Version: 2.2.1 Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 -Patch40: xkeyboard-config.macintosh.patch Patch100: p_suse.diff -Patch101: ibm_space_saver.diff -Patch104: xkeyboard-config.inet.patch -Patch106: microsoftnek4k.diff -Patch107: microsoftnek4k-symbols.diff -Patch108: microsoftnek4k-keycodes.diff Patch109: disable-2xalt_2xctrl-toggle.diff Patch110: MDSW-change-keycode.diff -Patch115: xkeyboard-config.inet.microsoftpro.patch -Patch118: xkeyboard-config.ctrl_alt_bksp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -63,17 +55,9 @@ Authors: %prep %setup -q translation-update-upstream -%patch40 %patch100 -%patch101 -%patch104 -%patch106 -%patch107 -%patch108 %patch109 -p1 %patch110 -%patch115 -p0 -%patch118 -p1 %build %configure --with-xkb-rules-symlink=xfree86,xorg \