Control: tags 732405 patch
Control: tags 650575 patch
Confirmed that 1.28 with these fixes builds in sid and in experimental +
alioth's libpng1.6.7, though I haven't tried to use either result.
An essentially identical libtiff fix (but not the libpng fix) is already
in Ubuntu: https://launchpad.net/ubuntu/+source/prima/+changelog
Note that dropping the whole of upstream 1.37 into the existing
packaging fails at debian/rules line 32, as img/codecs.c no longer exists.
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,10 @@
+prima (1.28-2) UNRELEASED; urgency=low
+
+ * Cherry-pick from upstream: allow compilation with newer versions of
+libtiff and libpng. Closes: #732405, #650575.
+
+ -- Rebecca Palmer palmer@lap14 Thu, 09 Jan 2014 09:43:46 +
+
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,7 +279,11 @@
{
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
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,
