Rediffing gnome-polkit.patch with common diff options.