Comment 27 for bug 281610

Right, reverted these three commits

e88df87851232d6b6c8da5fff802b33f5275b050 xkb: squash canonical types into explicit ones on core reconstruction.
be3b3cb970d040f0db4bead018c338012547334f xkb: fix core keyboard map generation. #14373
3bf826f59013ec14fbcf19b85a03e2967a821661 xkb: fix use of uninitialized variable.

None of them fix the problem, even with all three reverted, no improvement.

The message in the log ... "No core keyboard" seems to originate from dix/devices.c on line 532 (post patching). The following commits between 1.5.1-1ubuntu2 and 1.5.1-1ubuntu3 affect this file:

b1b567e30678b6515ff3067ed7f1aae5f541c3ae Fix 137 backport, one line missing from XIGetDeviceProperty
a834ce903f4a2f54e1145336b331493c3b696501 Merge patches 138 and 139 into 137

These commits alter patch 137 which pulls in what seems to be called the XI API. I've tried reverting these patches but the really odd thing is once they have been removed the build fails due to undefined macro constant XI_PROP_ENABLED - seems include/xserver-properties.h file is missing from the earlier version of these patches???

I need to quit this for today. Do these last 2 commits look likely suspects? Is it worth continuing to try and revert them?