904989d
Fix a cosmetic mismerge This is cosmetic only because we don't build in a subdir like we maybe ought to; I cherry-picked the additional "xkb" bit into 1.19.4 because my subdir builds were failing without it.