Control: tags 826797 + pending Dear maintainer,
I've prepared an NMU for pngnq (versioned as 1.0-2.3) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. diff -u pngnq-1.0/debian/changelog pngnq-1.0/debian/changelog --- pngnq-1.0/debian/changelog +++ pngnq-1.0/debian/changelog @@ -1,3 +1,12 @@ +pngnq (1.0-2.3) unstable; urgency=medium + + * Non-maintainer upload. + * Replace patch libpng16.patch with pngnq-1.1.patch, taken from the upstream + bug https://sourceforge.net/p/pngnq/patches/5/, to fix the support for + libpng >= 1.5. (Closes: #826797) + + -- Pino Toscano <p...@debian.org> Sat, 06 Aug 2016 10:00:38 +0200 + pngnq (1.0-2.2) unstable; urgency=medium * Non-maintainer upload. reverted: --- pngnq-1.0/debian/patches/libpng16.patch +++ pngnq-1.0.orig/debian/patches/libpng16.patch @@ -1,20 +0,0 @@ ---- a/src/rwpng.c -+++ b/src/rwpng.c -@@ -32,15 +32,10 @@ - #include <stdio.h> - #include <stdlib.h> - --#include "png.h" /* libpng header; includes zlib.h */ -+#include <zlib.h> -+#include "png.h" - #include "rwpng.h" /* typedefs, common macros, public prototypes */ - --/* future versions of libpng will provide this macro: */ --/* GRR NOTUSED */ --#ifndef png_jmpbuf --# define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf) --#endif -- - static void rwpng_error_handler(png_structp png_ptr, png_const_charp msg); - - only in patch2: unchanged: --- pngnq-1.0.orig/debian/patches/pngnq-1.1.patch +++ pngnq-1.0/debian/patches/pngnq-1.1.patch @@ -0,0 +1,56 @@ +Author: Ryan Fogarty +Description: pngnq compile broken for libpng 1.5.X +Forwarded: https://sourceforge.net/p/pngnq/patches/5/ +Bug-Debian: https://bugs.debian.org/826797 + +--- pngnq-1.1-old/src/rwpng.c 2010-05-10 18:42:56.000000000 -0400 ++++ pngnq-1.1/src/rwpng.c 2012-04-09 10:44:16.384272887 -0400 +@@ -32,7 +32,6 @@ + #include <stdio.h> + #include <stdlib.h> + +-#include "png.h" /* libpng header; includes zlib.h */ + #include "rwpng.h" /* typedefs, common macros, public prototypes */ + + /* future versions of libpng will provide this macro: */ +--- pngnq-1.1-old/src/rwpng.h 2010-05-10 18:42:56.000000000 -0400 ++++ pngnq-1.1/src/rwpng.h 2012-04-09 10:53:53.364767196 -0400 +@@ -29,6 +29,15 @@ + + ---------------------------------------------------------------------------*/ + ++#ifndef PNGNQ_RWPNG_H ++#define PNGNQ_RWPNG_H ++ ++#include <png.h> ++ ++#if defined(PNG_LIBPNG_VER_MINOR) && PNG_LIBPNG_VER_MINOR >= 5 ++# include <zlib.h> ++#endif ++ + #ifndef TRUE + # define TRUE 1 + # define FALSE 0 +@@ -65,9 +74,15 @@ + + typedef struct _mainprog_info { + double gamma; ++#if defined(PNG_LIBPNG_VER_MINOR) && PNG_LIBPNG_VER_MINOR >= 5 ++ png_uint_32 width; /* read/write */ ++ png_uint_32 height; /* read/write */ ++ png_uint_32 rowbytes; /* read */ ++#else + ulg width; /* read/write */ + ulg height; /* read/write */ + ulg rowbytes; /* read */ ++#endif + void *png_ptr; /* read/write */ + void *info_ptr; /* read/write */ + rwpng_color palette[256]; /* write */ +@@ -111,3 +126,6 @@ + int rwpng_write_image_row(mainprog_info *mainprog_ptr); + + int rwpng_write_image_finish(mainprog_info *mainprog_ptr); ++ ++#endif // PNGNQ_RWPNG_H ++
