tags 650575 + pending tags 732405 + pending thanks Dear maintainer,
I've prepared an NMU for prima (versioned as 1.28-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -u prima-1.28/debian/control prima-1.28/debian/control --- prima-1.28/debian/control +++ prima-1.28/debian/control @@ -14,7 +14,7 @@ libpng-dev, libxpm-dev, libjpeg-dev, - libtiff4-dev + libtiff-dev Standards-Version: 3.8.2 Homepage: http://search.cpan.org/dist/Prima/ diff -u prima-1.28/debian/changelog prima-1.28/debian/changelog --- prima-1.28/debian/changelog +++ prima-1.28/debian/changelog @@ -1,3 +1,18 @@ +prima (1.28-1.2) unstable; urgency=medium + + * Non-maintainer upload. + + [ Rebecca Palmer ] + * Cherry-pick from upstream: allow compilation with newer versions of + libtiff and libpng. Closes: #732405, #650575. + + [ Sebastian Ramacher ] + * debian/control: Build-Depend on libtiff-dev instead of libtiff4-dev. + * img/codec_png.c: Call png_get_io_ptr instead of accessing io_ptr directly. + Backported from upstream to fix compilation with libpng 1.5 and 1.6. + + -- Sebastian Ramacher <sramac...@debian.org> Fri, 17 Jan 2014 13:54:34 +0100 + prima (1.28-1.1) unstable; urgency=medium * Non-maintainer upload. only in patch2: unchanged: --- prima-1.28.orig/img/codec_png.c +++ prima-1.28/img/codec_png.c @@ -279,25 +279,29 @@ { char * buf = ( char *) png_get_error_ptr( png_ptr); if ( buf) strncpy( buf, msg, 256); +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR < 5 longjmp( png_ptr-> jmpbuf, 1); +#else + png_longjmp( png_ptr, 1); +#endif } static void img_png_read (png_structp png_ptr, png_bytep data, png_size_t size) { - req_read( (( PImgLoadFileInstance) png_ptr-> io_ptr)-> req, size, data); + req_read( (( PImgLoadFileInstance) png_get_io_ptr(png_ptr))-> req, size, data); } static void img_png_write (png_structp png_ptr, png_bytep data, png_size_t size) { - req_write( (( PImgLoadFileInstance) png_ptr-> io_ptr)-> req, size, data); + req_write( (( PImgLoadFileInstance) png_get_io_ptr(png_ptr))-> req, size, data); } static void img_png_flush (png_structp png_ptr) { - req_flush( (( PImgLoadFileInstance) png_ptr-> io_ptr)-> req); + req_flush( (( PImgLoadFileInstance) png_get_io_ptr(png_ptr))-> req); } static void * only in patch2: unchanged: --- prima-1.28.orig/img/codec_tiff.c +++ prima-1.28/img/codec_tiff.c @@ -161,6 +161,10 @@ { COMPRESSION_SGILOG24 , "SGILOG24"}, }; +#ifndef TIFF_VERSION +#define TIFF_VERSION TIFF_VERSION_CLASSIC +#endif + static ImgCodecInfo codec_info = { "TIFF Bitmap", "www.libtiff.org",
signature.asc
Description: Digital signature
