I was not able to apply the patch in #2. Got this error:
error: patch failed:...