Log Message:
Some fixes so this will build. Needs cmake in a builds depend. Actually delete
the 6 patch files not used anymore