- change LIB_DEPENDS to new format - remove upstreamed patch - add a dependency on the new libxkbcommon Approved by: dhn (implicit)