Bug#635707: xfig: FTBFS with libpng 1.5.2

[Nobuhiro Iwamatsu]

Package: xfig
Version: 3.2.5.b-1.1
Severity: important
Tags: patch
User: lib...@packages.debian.org
Usertags: libpng15-transition

Hi,

I uploaded libpng 1.5.2 to experimental.
libpng maintainers plan to transition from libpng 1.2 to 1.5.
I am checking build it the package depend to libpng.

I noticed your package FTBFS by libpng 1.5.
I appended the patch that corrected this problem.
Could you smoothly cooperate in libpng 1.5 to shift?

Best regards,
  Nobuhiro

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.39-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

diff -u xfig-3.2.5.b/debian/changelog xfig-3.2.5.b/debian/changelog
--- xfig-3.2.5.b/debian/changelog
+++ xfig-3.2.5.b/debian/changelog
@@ -1,3 +1,10 @@
+xfig (1:3.2.5.b-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * transition libpng 1.5.2.
+
+ -- Nobuhiro Iwamatsu <iwama...@nigauri.org>  Thu, 26 May 2011 16:57:04 +0900
+
 xfig (1:3.2.5.b-1.1) unstable; urgency=high
 
   * Non-maintainer upload by the Security Team.
only in patch2:
unchanged:
--- xfig-3.2.5.b.orig/f_readpng.c
+++ xfig-3.2.5.b/f_readpng.c
@@ -43,7 +43,7 @@
     char	   *ptr;
     int		    num_palette;
     png_colorp	    palette;
-    png_color_16    background;
+    png_color_16    background, *image_background;
 
     /* make scale factor smaller for metric */
     float scale = (appres.INCHES ?
@@ -73,7 +73,7 @@
     }
 
     /* set long jump recovery here */
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(png_jmpbuf((png_ptr)))) {
 	/* if we get here there was a problem reading the file */
 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
 	close_picfile(file,filetype);
@@ -90,14 +90,18 @@
     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
 	&interlace_type, &compression_type, &filter_type);
 
-    if (info_ptr->valid & PNG_INFO_gAMA)
-	png_set_gamma(png_ptr, 2.2, info_ptr->gamma);
-    else
+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) {
+	double gamma;
+	png_get_gAMA(png_ptr, info_ptr, &gamma);
+	png_set_gamma(png_ptr, 2.2, gamma);
+	} else {
 	png_set_gamma(png_ptr, 2.2, 0.45);
+	}
 
-    if (info_ptr->valid & PNG_INFO_bKGD)
+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD) && 
+        png_get_bKGD(png_ptr, info_ptr, &image_background))
 	/* set the background to the one supplied */
-	png_set_background(png_ptr, &info_ptr->background,
+	png_set_background(png_ptr, image_background,
 		PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
     else {
 	/* blend the canvas background using the alpha channel */
@@ -136,7 +140,7 @@
 
 	if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
 	    png_get_hIST(png_ptr, info_ptr, &histogram);
-	    png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
+	    png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
 	}
     }
     if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
only in patch2:
unchanged:
--- xfig-3.2.5.b.orig/f_wrpng.c
+++ xfig-3.2.5.b/f_wrpng.c
@@ -20,6 +20,7 @@
 #include "w_msgpanel.h"
 #include "w_setup.h"
 #include <png.h>
+#include <zlib.h>
 
 /*
  * Write PNG file from rgb data
@@ -59,7 +60,7 @@
     }
 
     /* set long jump recovery here */
-    if (setjmp(png_ptr->jmpbuf)) {
+	if (setjmp(png_jmpbuf((png_ptr)))) {
 	/* if we get here there was a problem reading the file */
 	png_destroy_write_struct(&png_ptr, &info_ptr);
 	return False;