Author: barbier Date: 2006-09-27 15:55:00 -0400 (Wed, 27 Sep 2006) New Revision: 3523
Added: trunk/xserver/xorg-server/debian/patches/22_xkb_cycle_3layouts.diff Modified: trunk/xserver/xorg-server/debian/changelog trunk/xserver/xorg-server/debian/patches/series Log: Add 22_xkb_cycle_3layouts.diff to fix layout switching when 3 layouts are present. Thanks Ivan Pascal for the patch. Closes: #345803 Modified: trunk/xserver/xorg-server/debian/changelog =================================================================== --- trunk/xserver/xorg-server/debian/changelog 2006-09-27 19:13:48 UTC (rev 3522) +++ trunk/xserver/xorg-server/debian/changelog 2006-09-27 19:55:00 UTC (rev 3523) @@ -1,5 +1,5 @@ xorg-server (2:1.1.1-9) UNRELEASED; urgency=low - + [ Jurij Smakov ] * Add 21_glx_align_fixes.patch to reintroduce the setting of __GLX_ALIGN64 variable, lost during the modular transition. This setting is essential @@ -7,8 +7,12 @@ alpha, sparc, amd64, ia64 and s390, mimicking the behaviour of the monolithic build. Closes: #388125. - -- Jurij Smakov <[EMAIL PROTECTED]> Tue, 26 Sep 2006 21:53:54 -0700 + [ Denis Barbier ] + * Add 22_xkb_cycle_3layouts.diff to fix layout switching when 3 layouts + are present. Thanks Ivan Pascal for the patch. Closes: #345803 + -- Denis Barbier <[EMAIL PROTECTED]> Wed, 27 Sep 2006 21:52:28 +0200 + xorg-server (2:1.1.1-8) unstable; urgency=low * Update mesa symlink patch to the latest from HEAD Added: trunk/xserver/xorg-server/debian/patches/22_xkb_cycle_3layouts.diff =================================================================== --- trunk/xserver/xorg-server/debian/patches/22_xkb_cycle_3layouts.diff (rev 0) +++ trunk/xserver/xorg-server/debian/patches/22_xkb_cycle_3layouts.diff 2006-09-27 19:55:00 UTC (rev 3523) @@ -0,0 +1,23 @@ +This patch fixes layout switching when 3 layouts are present. +It has been provided by Ivan Pascal in http://bugs.debian.org/345803 + +Not submitted upstream. + +Index: xorg-server/xkb/xkbUtils.c +=================================================================== +--- xorg-server.orig/xkb/xkbUtils.c ++++ xorg-server/xkb/xkbUtils.c +@@ -757,11 +757,11 @@ + + grp= state->locked_group; + if (grp>=ctrls->num_groups) +- state->locked_group= XkbAdjustGroup(grp,ctrls); ++ state->locked_group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); + + grp= state->locked_group+state->base_group+state->latched_group; + if (grp>=ctrls->num_groups) +- state->group= XkbAdjustGroup(grp,ctrls); ++ state->group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); + else state->group= grp; + XkbComputeCompatState(xkbi); + return; Modified: trunk/xserver/xorg-server/debian/patches/series =================================================================== --- trunk/xserver/xorg-server/debian/patches/series 2006-09-27 19:13:48 UTC (rev 3522) +++ trunk/xserver/xorg-server/debian/patches/series 2006-09-27 19:55:00 UTC (rev 3523) @@ -19,3 +19,4 @@ 19_configurable_misc_utils.patch 20_mesa_6.5.1.diff 21_glx_align_fixes.patch +22_xkb_cycle_3layouts.diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]