This is the method Ran suggests as a workaround in https://github.com/xkbcommon/libxkbcommon/pull/10
5f7b81e keybindings: Use a less hacky method of getting the proper modifier mask
src/Makefile.am | 2 -
src/core/keybindings.c | 11 ++++-
src/core/xkbcommon-hacks.c | 112 --------------------------------------------
src/core/xkbcommon-hacks.h | 34 --------------
4 files changed, 9 insertions(+), 150 deletions(-)
Upstream: git.gnome.org