Fix build with libpng-1.5.

[dirtyepic@…]

The following patch is required for wxGTK-2.8 to build against >=libpng-1.5.  Please include it in the upcoming 2.8.12.0 release.

[dirtyepic@…]

/var/tmp/portage/x11-libs/wxGTK-2.8.11.0/work/wxPython-src-2.8.11.0/wxgtk_build/bk-deps x86_64-unknown-linux-gnu-g++ -c -o coredll_imagpng.o  -D__WXGTK__     -DWXBUILDING      -I/var/tmp/portage/x11-libs/wxGTK-2.8.11.0/work/wxPython-src-2.8.11.0/src/regex  -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 -fPIC -DPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -I/var/tmp/portage/x11-libs/wxGTK-2.8.11.0/work/wxPython-src-2.8.11.0/wxgtk_build/lib/wx/include/gtk2-unicode-release-2.8 -I/var/tmp/portage/x11-libs/wxGTK-2.8.11.0/work/wxPython-src-2.8.11.0/include -pthread -DQT_SHARED -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/libdrm -I/usr/include/qt4/QtCore -pthread -DORBIT2=1 -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0 -pthread -Wall -Wundef -Wno-ctor-dtor-privacy -O2 -fno-strict-aliasing -O2 -march=native -g -pipe -fno-strict-aliasing /var/tmp/portage/x11-libs/wxGTK-2.8.11.0/work/wxPython-src-2.8.11.0/src/common/imagpng.cpp

../src/common/imagpng.cpp: In member function 'virtual bool wxPNGHandler::LoadFile(wxImage*, wxInputStream&, bool, int)':
../src/common/imagpng.cpp:532:30: error: 'voidp' was not declared in this scope
../src/common/imagpng.cpp:589:40: error: invalid use of incomplete type 'png_info'
/usr/include/libpng15/png.h:666:16: error: forward declaration of 'png_info'
../src/common/imagpng.cpp:596:28: error: invalid use of incomplete type 'png_info'
/usr/include/libpng15/png.h:666:16: error: forward declaration of 'png_info'
../src/common/imagpng.cpp:597:28: error: invalid use of incomplete type 'png_info'
/usr/include/libpng15/png.h:666:16: error: forward declaration of 'png_info'
../src/common/imagpng.cpp:598:28: error: invalid use of incomplete type 'png_info'
/usr/include/libpng15/png.h:666:16: error: forward declaration of 'png_info'
make: *** [coredll_imagpng.o] Error 1

[vadz]

FWIW this looks correct to me (it corresponds to the trunk code) so it could be applied.

[juliansmart]

Applied, thanks.