^you could sort these

^cmake:outsource

USE_GNOME before USE_XORg

why is this move needed?

This is the upstreamed patch that fixes the build. It was the include order problem.

if it's upstreamed, include the url a top of the patch so that people looking at it don't have the same reaction as I jsut did :) -- , or even better rename the patch to
patch-git_<rev>
and use the upstream commit as patch :)