My guess on why this isn't applying is due to DOS vs UNIX line endings, the patch has one, the files have the other.