diff -u lightspeed-1.2a/src/snapshot.c lightspeed-1.2a/src/snapshot.c --- lightspeed-1.2a/src/snapshot.c +++ lightspeed-1.2a/src/snapshot.c @@ -28,6 +28,7 @@ #ifdef HAVE_LIBPNG #include static int write_png( int message, const void *data ); +#include #endif #ifdef HAVE_LIBTIFF @@ -305,7 +306,11 @@ return -1; png_write_s = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); png_info_s = png_create_info_struct( png_write_s ); +#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 + if (setjmp(png_jmpbuf(png_write_s))) { +#else if (setjmp( png_write_s->jmpbuf )) { +#endif /* Error writing file */ png_destroy_write_struct( &png_write_s, &png_info_s ); fclose( png_fp ); diff -u lightspeed-1.2a/debian/changelog lightspeed-1.2a/debian/changelog --- lightspeed-1.2a/debian/changelog +++ lightspeed-1.2a/debian/changelog @@ -1,3 +1,10 @@ +lightspeed (1.2a-8.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with libpng 1.5 + + -- Nobuhiro Iwamatsu Thu, 24 Nov 2011 06:43:45 +0900 + lightspeed (1.2a-8) unstable; urgency=low * Package maintainer set to Debian QA Group . diff -u lightspeed-1.2a/debian/control lightspeed-1.2a/debian/control --- lightspeed-1.2a/debian/control +++ lightspeed-1.2a/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian QA Group Standards-Version: 3.7.2.0 -Build-Depends: debhelper (>> 4.0.0), libgtkglext1-dev, libgtk2.0-dev, libpng12-dev, libtiff4-dev, libxi-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev, ftgl-dev, libfontconfig1-dev +Build-Depends: debhelper (>> 4.0.0), libgtkglext1-dev, libgtk2.0-dev, libpng-dev (>= 1.5), libtiff4-dev, libxi-dev, zlib1g-dev, libgl1-mesa-dev | libgl-dev, ftgl-dev, libfontconfig1-dev Package: lightspeed Architecture: any