-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Control: tags 742655 + pending Dear maintainer,
I've prepared an NMU for libtwin (versioned as 13.05.03.15.06-g287d16c-2.2) and uploaded it to DELAYED/4. Please feel free to tell me if I should delay it longer. diff -Nru libtwin-13.05.03.15.06-g287d16c/debian/changelog libtwin-13.05.03.15.06-g287d16c/debian/changelog - --- libtwin-13.05.03.15.06-g287d16c/debian/changelog 2015-12-23 03:14:24.000000000 +0100 +++ libtwin-13.05.03.15.06-g287d16c/debian/changelog 2016-01-22 12:56:48.000000000 +0100 @@ -1,3 +1,11 @@ +libtwin (13.05.03.15.06-g287d16c-2.2) unstable; urgency=medium + + * Non-maintainer upload. + [ Nobuhiro Iwamatsu ] + * Fix FTBFS with libpng16 (Closes: #742655) + + -- Gianfranco Costamagna <[email protected]> Fri, 22 Jan 2016 12:56:01 +0100 + libtwin (13.05.03.15.06-g287d16c-2.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru libtwin-13.05.03.15.06-g287d16c/debian/patches/series libtwin-13.05.03.15.06-g287d16c/debian/patches/series - --- libtwin-13.05.03.15.06-g287d16c/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ libtwin-13.05.03.15.06-g287d16c/debian/patches/series 2016-01-22 12:55:17.000000000 +0100 @@ -0,0 +1 @@ +suppport_libpng16 diff -Nru libtwin-13.05.03.15.06-g287d16c/debian/patches/suppport_libpng16 libtwin-13.05.03.15.06-g287d16c/debian/patches/suppport_libpng16 - --- libtwin-13.05.03.15.06-g287d16c/debian/patches/suppport_libpng16 1970-01-01 01:00:00.000000000 +0100 +++ libtwin-13.05.03.15.06-g287d16c/debian/patches/suppport_libpng16 2016-01-22 12:58:23.000000000 +0100 @@ -0,0 +1,50 @@ +Author: Nobuhiro Iwamatsu <[email protected]> +Description: support newer libpng + +--- libtwin-13.05.03.15.06-g287d16c.orig/configure.ac ++++ libtwin-13.05.03.15.06-g287d16c/configure.ac +@@ -1,4 +1,4 @@ +-dnl ++d3nl + dnl Twin - A Tiny Window System + dnl Copyright © 2003 Keith Packard, Noah Levitt + dnl All rights reserved. +@@ -119,7 +119,7 @@ AC_ARG_ENABLE(png, + + if test "x$twin_png" = "xyes" + then +- PKG_CHECK_MODULES(PNG, libpng12, twin_png="yes", twin_png="no") ++ PKG_CHECK_MODULES([PNG], [libpng], twin_png="yes", twin_png="no" ) + fi + + AC_SUBST(PNG_CFLAGS) +--- libtwin-13.05.03.15.06-g287d16c.orig/libtwin/twin_png.c ++++ libtwin-13.05.03.15.06-g287d16c/libtwin/twin_png.c +@@ -38,6 +38,15 @@ + #define DEBUG(fmt...) + #endif + ++#ifndef int_p_NULL ++#define int_p_NULL NULL ++#endif ++ ++#ifndef png_infopp_NULL ++#define png_infopp_NULL NULL ++#endif ++ ++ + typedef struct _twin_png_priv { + int fd; + } twin_png_priv_t; +@@ -115,7 +124,11 @@ twin_pixmap_t *twin_png_to_pixmap(const + if (ctype == PNG_COLOR_TYPE_PALETTE) + png_set_palette_to_rgb(png); + if (ctype == PNG_COLOR_TYPE_GRAY && depth < 8) ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ png_set_expand_gray_1_2_4_to_8(png); ++#else + png_set_gray_1_2_4_to_8(png); ++#endif + if (png_get_valid(png, info, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha(png); + diff -Nru libtwin-13.05.03.15.06-g287d16c/debian/rules libtwin-13.05.03.15.06-g287d16c/debian/rules - --- libtwin-13.05.03.15.06-g287d16c/debian/rules 2015-12-23 03:07:07.000000000 +0100 +++ libtwin-13.05.03.15.06-g287d16c/debian/rules 2016-01-22 12:55:51.000000000 +0100 @@ -33,7 +33,7 @@ endif export CFLAGS = $(shell dpkg-buildflags --get CFLAGS) $(extra_CFLAGS) - -export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -lX11 -lpng12 - -ljpeg -lz +export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -lX11 -lpng - -ljpeg -lz %: dh $@ --with autoreconf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBCAAGBQJWohmTAAoJEPNPCXROn13Z0hIP/3tPaL5mGzkSVwuPKLrpJVBY YpD8+IPKqkNoGshkb6WB8NaHBI6pGhvb26HkVrbWVYwZ0fCGl3IRpVgi08OEm0rO rBePMcr3naMwzP3r4jXK1oxq+vB72hX3Mt3IkS+OO330Hhs84a83K8yW16I01PJr F7l9eUtrDosjjol7oNTraJJihVEeTPnwNgr5G9Z+bW9TdgjbCNQh9R7N6maiB/uM LOTaXF9xU6aj4HLAO1ZJwxrc6l9Og7jggV+r/D7PC6nmeWMreUhEid9aReoeep0u EdAmmslfkxha51ewMvBjoVHqQ9OJRwXM2Tzyi97/LKM5zVGAqZf+/EAfUsL5/1Sq z2G/epopPO+/bV7W18Eq8cnXh4VxOxlX9c13DD/uShXA2ybr00iQjydiN29bGAy+ eNO2xPy1ze+2WkC30D3YRoHE8iZ2DQO/trS/k1fQvj7N4K/tgPctR/mDgpfvJV1J 3PuImTkg/4NfYCna7KZWjmKyVTuznl3Qn5S+2hLtF6fTkif0c6nWG2ibZAQMt4Nw MSSNPNJzpvxugLv78N92cZX//LBDLfLxPqQYPJtVXgdi4/QYesZGty1cicsyqzEU W8MCIjSozAIfBHrY4Gfcw097VsWoIKhDWh+w8CAWn/+VUM7KMS9eQF8SXehb5mEU fvdog4cpLlJTu9/cnATt =MNqg -----END PGP SIGNATURE-----
