Bug#641888: xcftools: FTBFS with libpng 1.5

[Jan Hauke Rahm]

Hi Nobuhiro,

On Sat, Sep 17, 2011 at 04:15:04PM +0900, Nobuhiro Iwamatsu wrote:
 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 created the patch that revise this problem.
 Could you check and apply this patch?

The package builds fine with both versions now. It seems it's all good.
I'll upload the patched version to unstable within the next few days.
After that, a binNMU should be enough when libpng 1.5 hits unstable.

Thanks for taking good care of stuff!

Hauke

-- 
 .''`.   Jan Hauke Rahm j...@debian.org   www.jhr-online.de
: :'  :  Debian Developer www.debian.org
`. `'`   Member of the Linux Foundationwww.linux.com
  `- Fellow of the Free Software Foundation Europe  www.fsfe.org


signature.asc
Description: Digital signature

Bug#641888: xcftools: FTBFS with libpng 1.5

[Nobuhiro Iwamatsu]

Source: xcftools
Version: 1.0.7-2
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 created the patch that revise this problem.
Could you check and apply this patch?

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

-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6
--- xcftools-1.0.7.orig/xcf2png.c
+++ xcftools-1.0.7/xcf2png.c
@@ -59,7 +59,14 @@ my_error_callback(png_structp png_ptr, p
   FatalUnexpected(_(Libpng error '%s'),errormsg);
 }
 
-  
+#ifndef png_voidp_NULL
+#define png_voidp_NULL	NULL
+#endif
+
+#ifndef png_error_ptr_NULL
+#define png_error_ptr_NULL	NULL
+#endif
+
 static void
 init_output(void)
 {