Bug#400887: Not fixed en 3.5.6 Debian package

[Sune Vuorela]

On Monday 12 February 2007, Claus Hindsgaul wrote:
> Hi,
>
> Unfortunately the patch does not seem to have been applied in
> 3.5.6.dfsg.1-1. I can still fix the bug by recompiling (apt-build --patch)
> the
> 3.5.6.dfsg.1-1 package with the patch mentioned in the original bug
> report.

Hi Claus

I really wonder about this. The patch is applied to the tarball we are using.
It is this patch we are talking about, right ?

Index: kdelibs/kdecore/kkeynative_x11.cpp
===================================================================
--- kdelibs/kdecore/kkeynative_x11.cpp  (revision 604776)
+++ kdelibs/kdecore/kkeynative_x11.cpp  (working copy)
@@ -106,12 +106,15 @@
                return false;
        }

-       // FIXME: Accomadate non-standard layouts
        // XKeysymToKeycode returns the wrong keycode for XK_Print and 
XK_Break.
        // Specifically, it returns the code for SysReq instead of Print
-       if( m_sym == XK_Print && !(m_mod & Mod1Mask) )
+       // Only do this for the default Xorg layout, other keycode mappings
+       // (e.g. evdev) don't need or want it.
+       if( m_sym == XK_Print && !(m_mod & Mod1Mask) &&
+                XKeycodeToKeysym( qt_xdisplay(), 111, 0 ) == XK_Print )
                m_code = 111; // code for Print
-       else if( m_sym == XK_Break || (m_sym == XK_Pause && (m_mod & 
ControlMask)) )
+       else if( m_sym == XK_Break || (m_sym == XK_Pause && (m_mod & 
ControlMask)) &&
+                XKeycodeToKeysym( qt_xdisplay(), 114, 0 ) == XK_Pause )
                m_code = 114;
        else
                m_code = XKeysymToKeycode( qt_xdisplay(), m_sym );
Index: kdelibs/kdecore/kglobalaccel_x11.cpp
===================================================================
--- kdelibs/kdecore/kglobalaccel_x11.cpp        (revision 604776)
+++ kdelibs/kdecore/kglobalaccel_x11.cpp        (working copy)
@@ -169,7 +169,9 @@
        uchar keyCodeX = key.code();
        uint keyModX = key.mod() & g_keyModMaskXAccel; // Get rid of any 
non-relevant bits in mod
        // HACK: make Alt+Print work
-       if( key.sym() == XK_Sys_Req ) {
+       // only do this for the Xorg default keyboard keycodes,
+       // other mappings (e.g. evdev) don't need or want it
+       if( key.sym() == XK_Sys_Req && XKeycodeToKeysym( qt_xdisplay(), 111, 
0 ) == XK_Print ) {
            keyModX |= KKeyServer::modXAlt();
            keyCodeX = 111;
        }

/Sune

-- 
How might I remove the port?

You must install on the IDE Internet site on the CPU but from the control 
preferences inside Outlook you have to open a serial firewall for receiving a 
login of the BIOS over a window over a GUI.

pgpC8saMX8R0l.pgp
Description: PGP signature