The patch does not cleanly apply: ------ Applying patch libpng16.patch patching file Source/FreeImage/PluginPNG.cpp Hunk #1 FAILED at 713. Hunk #2 FAILED at 1000. 2 out of 2 hunks FAILED -- rejects in file Source/FreeImage/PluginPNG.cpp Patch libpng16.patch does not apply (enforce with -f) ------
Also, looking at the patch, what are the rationales behind commenting out the call to png_set_iCPP but not png_get_iCPP for libpng 1.4+?
Could you also point use to the Fedora patch this is taken from for reference?
Many thanks, Ghis On Mon, 25 Jan 2016 15:10:58 +0100 Anton Gladky <[email protected]> wrote:
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 <[email protected]>: > 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 <[email protected]> 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 <[email protected]> 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 @@
-- debian-science-maintainers mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
