Control: tags 809870 + patch Control: tags 809870 + pending Hi Georges,
please see the attached patch; libpng1.6 has some API changes -- like not exposing the members of the png_info struct anymore -- and won't include e.g zlib.h. I've prepared an NMU for openlayer (versioned as 2.1-2.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards. diff -Nru openlayer-2.1/debian/changelog openlayer-2.1/debian/changelog --- openlayer-2.1/debian/changelog 2016-01-09 17:44:31.000000000 +0100 +++ openlayer-2.1/debian/changelog 2016-01-24 13:26:24.000000000 +0100 @@ -1,3 +1,11 @@ +openlayer (2.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with libpng16" -- new library requires some includes + and has API change. (Closes: #809870) + + -- Tobias Frost <[email protected]> Sun, 24 Jan 2016 13:26:24 +0100 + openlayer (2.1-2) unstable; urgency=medium * upgraded the dependency on libpng-dev. Closes: #809870 diff -Nru openlayer-2.1/debian/patches/libpng16.patch openlayer-2.1/debian/patches/libpng16.patch --- openlayer-2.1/debian/patches/libpng16.patch 1970-01-01 01:00:00.000000000 +0100 +++ openlayer-2.1/debian/patches/libpng16.patch 2016-01-24 13:29:17.000000000 +0100 @@ -0,0 +1,40 @@ +--- a/src/loadpng.c ++++ b/src/loadpng.c +@@ -4,7 +4,7 @@ + * This file is hereby placed in the public domain. + */ + +- ++#include <zlib.h> + #include <png.h> + #include <allegro.h> + #include <allegro/internal/aintern.h> +@@ -258,7 +258,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + pack_fclose(fp); +@@ -357,7 +357,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + /* If we get here, we had a problem reading the file */ +--- a/src/savepng.c ++++ b/src/savepng.c +@@ -188,7 +188,7 @@ + goto Error; + + /* Set error handling. */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + /* If we get here, we had a problem reading the file. */ + goto Error; + } diff -Nru openlayer-2.1/debian/patches/series openlayer-2.1/debian/patches/series --- openlayer-2.1/debian/patches/series 2014-01-11 23:36:01.000000000 +0100 +++ openlayer-2.1/debian/patches/series 2016-01-24 13:24:29.000000000 +0100 @@ -1,3 +1,4 @@ changes-2014-01-06.patch harden.patch shared.patch +libpng16.patch
