Comment 8 for bug 40866

For the xkbcomp workaround to set the modifier bits correctly:
Read out the xkbcomp with
$ xkbcomp -o my-xkbcomp :0.0
Modify the xkbcomp map with your editor.
Read it back in with
$ xkbcomp my-xkbcomp :0.0
(ignore the warnings of undefined keys).
Attached is the diff of my xkbcomp, if this helps.
See at the end of the diff to see how to change the modifier bits.