OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=17

MDSW-change-keycode.diff

@@ -0,0 +1,41 @@
+--- symbols/inet.orig	2008-05-14 06:09:21.000000000 +0200
++++ symbols/inet	2008-05-14 06:16:57.000000000 +0200
+@@ -2093,7 +2093,7 @@ partial xkb_symbols "apple" {
+     key <K5E>	{	[ F14 ]    };
+     key <K5F>	{	[ F15 ]    };
+     key <K6C>	{	[ XF86Eject ]    };
+-    key <MDSW>	{	[ F16 ]    };
++    key <II5D>	{	[ F16 ]    };
+ };
+ 
+ partial alphanumeric_keys
+@@ -2233,7 +2233,7 @@ xkb_symbols "logitech_g15" {
+     key  <K74> {         [         XF86WWW ] };
+     key  <K75> {         [     XF86LaunchE ] };
+ 
+-    key <MDSW> {         [     XF86Launch1 ] };
++    key <II5D> {         [     XF86Launch1 ] };
+     key <NFER> {         [     XF86Launch2 ] };
+ 
+     key <XFER> {         [     XF86Launch8 ] };
+--- keycodes/xfree86.orig	2008-05-14 06:17:28.000000000 +0200
++++ keycodes/xfree86	2008-05-14 06:21:33.000000000 +0200
+@@ -301,6 +301,9 @@ xkb_keycodes "basic" {
+     // MacBooks generate 0x65 for the lower brightness key
+     <II65> =  101;
+ 
++    // Required for apple/logitech_g15 keyboard
++    <II5D> = 93;
++
+     // Codes generated for scancodes 0x59-0x5f, 0x62-0x76
+     <K59> =   157;		// <I1D>
+     <K5A> =   170;		// <I2A>
+@@ -355,7 +358,7 @@ xkb_keycodes "basic" {
+     // Other codes never generated.  The XFree86 ddx never generates
+     // these codes.
+     // Thus we can use them as fake keys
+-    <MDSW> =    93; // <U5D>
++    <MDSW> =     8;
+     <LVL3> =   124; // <U7C>
+     <ALT>  =   125; // <U7D>
+     <META> =   156; // <I1C>

disable-2xalt_2xctrl-toggle.diff

@@ -0,0 +1,31 @@
+diff -aurp xkeyboard-config-1.2/rules/base.lst xkeyboard-config-1.2-patched/rules/base.lst
+--- xkeyboard-config-1.2/rules/base.lst	2008-01-29 22:54:02.000000000 +0100
++++ xkeyboard-config-1.2-patched/rules/base.lst	2008-05-13 13:13:01.545881000 +0200
+@@ -545,8 +545,6 @@
+   grp:shift_caps_toggle Shift+CapsLock changes layout.
+   grp:alt_caps_toggle  Alt+CapsLock changes layout.
+   grp:shifts_toggle    Both Shift keys together change layout.
+-  grp:alts_toggle      Both Alt keys together change layout.
+-  grp:ctrls_toggle     Both Ctrl keys together change layout.
+   grp:ctrl_shift_toggle Ctrl+Shift change layout.
+   grp:lctrl_lshift_toggle LCtrl+LShift change layout.
+   grp:ctrl_alt_toggle  Alt+Ctrl change layout.
+diff -aurp xkeyboard-config-1.2/rules/base.xml.in xkeyboard-config-1.2-patched/rules/base.xml.in
+--- xkeyboard-config-1.2/rules/base.xml.in	2008-01-08 00:08:25.000000000 +0100
++++ xkeyboard-config-1.2-patched/rules/base.xml.in	2008-05-13 13:13:23.870533000 +0200
+@@ -3620,6 +3620,7 @@
+           <_description>Both Shift keys together change layout.</_description>
+         </configItem>
+       </option>
++      <!--
+       <option>
+         <configItem>
+           <name>grp:alts_toggle</name>
+@@ -3632,6 +3633,7 @@
+           <_description>Both Ctrl keys together change layout.</_description>
+         </configItem>
+       </option>
++      -->
+       <option>
+         <configItem>
+           <name>grp:ctrl_shift_toggle</name>

xkeyboard-config.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu May 15 08:23:45 CEST 2008 - sndirsch@suse.de
+
+- MDSW-change-keycode.diff
+  * change keycode for virtual <MDSW> key (bnc #389943) 
+
+-------------------------------------------------------------------
+Tue May 13 14:45:28 CEST 2008 - sndirsch@suse.de
+
+- disable-2xalt_2xctrl-toggle.diff
+  * disable Ctrl-Ctrl and Alt-Alt toggle (bnc #373197)
+
 -------------------------------------------------------------------
 Fri Apr  4 15:24:39 CEST 2008 - sndirsch@suse.de
 

xkeyboard-config.spec

@@ -21,7 +21,7 @@ Provides:       xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
 AutoReqProv:    on
 Version:        1.2
-Release:        27
+Release:        37
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch4:         xkeyboard-config.mainline-cvs.mac-es.patch
@@ -35,6 +35,8 @@ Patch105:       lv.diff
 Patch106:       microsoftnek4k.diff
 Patch107:       microsoftnek4k-symbols.diff
 Patch108:       microsoftnek4k-keycodes.diff
+Patch109:       disable-2xalt_2xctrl-toggle.diff
+Patch110:       MDSW-change-keycode.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -67,6 +69,8 @@ Authors:
 %patch106
 %patch107
 %patch108
+%patch109 -p1
+%patch110
 
 %build
 %configure --with-xkb-rules-symlink=xfree86,xorg \
@@ -96,6 +100,12 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/X11/xkb/
 
 %changelog
+* Thu May 15 2008 sndirsch@suse.de
+- MDSW-change-keycode.diff
+  * change keycode for virtual <MDSW> key (bnc #389943)
+* Tue May 13 2008 sndirsch@suse.de
+- disable-2xalt_2xctrl-toggle.diff
+  * disable Ctrl-Ctrl and Alt-Alt toggle (bnc #373197)
 * Fri Apr 04 2008 sndirsch@suse.de
 - keyboard layout switching is now also possible as root (bnc #335553)
 * Mon Mar 10 2008 sndirsch@suse.de