I can not understand all this trouble with patching anyway.
Invalid patch files and such. Well, first of all I would probably just upload the .patch file, like -z- did it (instead of using pastebins). And when I used to create or apply patches with tortoise svn, I never had problems either.
That's so weird.