X11 patch no longer needed.
png.c