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