fix misformatting in CMake patch, oopsie
allow re-building with patches without cleanup

   If first attempt to patch fails, try reverting and re-applying the
   patch.