Make the patch apply to the recent src tree