Comment 0 for bug 58083

In xorg 7.1, if you run gnome-keyboard-properties (the "Keyboard" capplet from
gnome-control-center), click on the "Layouts" tab, and click "Add", you'll get
a window with a list of keyboard layouts, but no actual keyboard picture, and
it spews an error message about XkbGetKeyboard failing.

Reverting xkb/xkbfmisc.c, xkb/xkbout.c and xkb/xkbtext.c to their pre-March
27 state fixes the bug.

Turning on server xkb debugging shows:

The XKEYBOARD keymap compiler (xkbcomp) reports:
> Error: Missing Types section in a Keymap file
> Error: Missing KeyNames section in a Keymap file
> Description of Keymap not compiled
Errors from xkbcomp are not fatal to the X server
xkb executes: "/usr/X11R6/bin/xkbcomp" -w 10 "-R/etc/X11/xkb" -xkm "-" -em1 "The
XKEYBOARD keymap compiler (xkbcomp) reports:" -emp "> " -eml "Errors from
xkbcomp are not fatal to the X server" "/etc/X11/xkb/compiled/server-0.xkm"
xkbcomp input:
xkb_keymap "default" {
    xkb_compatibility { include "%" };
    xkb_symbols { include "%" };
    xkb_geometry { include "%" };
};
end xkbcomp input
(EE) Error loading keymap /etc/X11/xkb/compiled/server-0.xkm

(Disclaimer: I actually tested this against Xgl, not straight Xorg, but Xgl
makes no changes to the xkb implementation.)