re-diffed xpdf patch with -u