Thanks, Tobias, for the patch and NMU. I have pushed your changes to ou git.
Ghis, if you have a fixed reproducibility, please push it to git and I will upload a new version with both changes. Regards Anton 2016-01-25 14:57 GMT+01:00 Ghislain Vaillant <ghisv...@gmail.com>: > I was about to submit an update for the reproducibility problem. I can > prepare a proper update with your patch in it. > > How does that sound? > > Ghis > > > > On Fri, 22 Jan 2016 06:33:52 +0100 Tobias Frost <t...@debian.org> wrote: > >> Control: tags 742560 + patch >> Control: tags 742560 + pending >> >> Dear maintainer, >> >> I've prepared an NMU for freeimage (versioned as 3.17.0+ds1-1.1) and >> uploaded it to DELAYED/7. Please feel free to tell me if I >> should delay it longer. >> >> Regards. >> diff -Nru freeimage-3.17.0+ds1/debian/changelog >> freeimage-3.17.0+ds1/debian/changelog >> --- freeimage-3.17.0+ds1/debian/changelog 2016-01-18 >> 08:33:50.000000000 +0100 >> +++ freeimage-3.17.0+ds1/debian/changelog 2016-01-22 >> 06:12:59.000000000 +0100 >> @@ -1,3 +1,10 @@ >> +freeimage (3.17.0+ds1-1.1) UNRELEASED; urgency=medium >> + >> + * Non-maintainer upload. >> + * Fix FTBFS with libpng16 to help preparing the libpng16 transition. >> + >> + -- Tobias Frost <t...@debian.org> Fri, 22 Jan 2016 06:12:17 +0100 >> + >> freeimage (3.17.0+ds1-1) unstable; urgency=medium >> >> * Move from experimental to unstable. >> diff -Nru freeimage-3.17.0+ds1/debian/patches/libpng16.patch >> freeimage-3.17.0+ds1/debian/patches/libpng16.patch >> --- freeimage-3.17.0+ds1/debian/patches/libpng16.patch 1970-01-01 >> 01:00:00.000000000 +0100 >> +++ freeimage-3.17.0+ds1/debian/patches/libpng16.patch 2016-01-22 >> 06:10:39.000000000 +0100 >> @@ -0,0 +1,34 @@ >> +--- a/Source/FreeImage/PluginPNG.cpp >> ++++ b/Source/FreeImage/PluginPNG.cpp >> +@@ -713,11 +713,19 @@ >> + >> + if (png_get_valid(png_ptr, info_ptr, >> PNG_INFO_iCCP)) { >> + png_charp profile_name = NULL; >> ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 >> ++ png_bytepp profile_data = NULL; >> ++#else >> + png_charp profile_data = NULL; >> ++#endif >> + png_uint_32 profile_length = 0; >> + int compression_type; >> + >> ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 >> ++ png_get_iCCP(png_ptr, info_ptr, >> &profile_name, &compression_type, profile_data, &profile_length); >> ++#else >> + png_get_iCCP(png_ptr, info_ptr, >> &profile_name, &compression_type, &profile_data, &profile_length); >> ++#endif >> + >> + // copy ICC profile data (must be done >> after FreeImage_AllocateHeader) >> + >> +@@ -1000,7 +1008,11 @@ >> + >> + FIICCPROFILE *iccProfile = >> FreeImage_GetICCProfile(dib); >> + if (iccProfile->size && iccProfile->data) { >> ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 >> ++ //png_set_iCCP(png_ptr, info_ptr, >> "Embedded Profile", 0, (png_const_bytep)iccProfile->data, iccProfile->size); >> ++#else >> + png_set_iCCP(png_ptr, info_ptr, "Embedded >> Profile", 0, (png_charp)iccProfile->data, iccProfile->size); >> ++#endif >> + } >> > > -- > debian-science-maintainers mailing list > debian-science-maintainers@lists.alioth.debian.org > > http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers >
-- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers