Am Montag, den 25.01.2016, 17:58 +0000 schrieb Ghislain Vaillant: > ------ > 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+? Yes, about the ICC profiles... Sh.. Ah, Sorry, I forgot to mention that: libpng1.6 seems to be more pickier on ICC profiles. You'll see that when you run the test suite: *** PNG Format known incorrect sRGB profile *** Aborted > Could you also point use to the Fedora patch this is taken from for > reference? The patch is from here: http://pkgs.fedoraproject.org/cgit/rpms/freeimage.git/tree/FreeImage-3. 10.0-libpng15.patch?id=5822c50abae307036e0b7ca4cda7cc8c8939db05 > Many thanks, > Ghis > >The patch does not cleanly apply: Here it does: tobi@edoras:~/workspace/deb/libpng-transistion/buildir/nmus$ apt-get source freeimage Reading package lists... Done Building dependency tree Reading state information... Done NOTICE: 'freeimage' packaging is maintained in the 'Git' version control system at: git://anonscm.debian.org/debian-science/packages/freeimage.git Please use: git clone git://anonscm.debian.org/debian- science/packages/freeimage.git to retrieve the latest (possibly unreleased) updates to the package. Skipping already downloaded file 'freeimage_3.17.0+ds1-1.dsc' Skipping already downloaded file 'freeimage_3.17.0+ds1.orig.tar.xz' Skipping already downloaded file 'freeimage_3.17.0+ds1-1.debian.tar.xz' Need to get 0 B of source archives. dpkg-source: info: extracting freeimage in freeimage-3.17.0+ds1 dpkg-source: info: unpacking freeimage_3.17.0+ds1.orig.tar.xz dpkg-source: info: unpacking freeimage_3.17.0+ds1-1.debian.tar.xz dpkg-source: info: applying Disable-vendored-dependencies.patch dpkg-source: info: applying Use-system-dependencies.patch dpkg-source: info: applying Fix-macro-redefinition-for-64-bit-integer- types.patch dpkg-source: info: applying Fix-compatibility-with-system-libpng.patch dpkg-source: info: applying Fix-doxygen-output-settings.patch dpkg-source: info: applying Disable-usage-of-HTML-timestamps-in- doxygen.patch dpkg-source: info: applying Fix-unsafe-usage-of-printf-in- testsuite.patch dpkg-source: info: applying Disable-testing-of-JPEG-transform.patch dpkg-source: info: applying Disable-testing-of-JXR-MemIO.patch dpkg-source: info: applying Fix-missing-cstdio-include-in- testsuite.patch dpkg-source: info: applying Fix-endianness-detection.patch dpkg-source: info: applying Fix-CVE-2015-0852.patch dpkg-source: info: applying Fix-encoding-of-fi-header.patch tobi@edoras:~/workspace/deb/libpng-transistion/buildir/nmus$ cd freeimage-3.17.0+ds1/ tobi@edoras:~/workspace/deb/libpng-transistion/buildir/nmus/freeimage- 3.17.0+ds1$ cat /tmp/bug_742560_message_19.mbox | patch -p1 patching file debian/changelog patching file debian/patches/libpng16.patch patching file debian/patches/series tobi@edoras:~/workspace/deb/libpng-transistion/buildir/nmus/freeimage- 3.17.0+ds1$ quilt push Applying patch libpng16.patch patching file Source/FreeImage/PluginPNG.cpp Now at patch libpng16.patch tobi@edoras:~/workspace/deb/libpng-transistion/buildir/nmus/freeimage- 3.17.0+ds1$ -- tobi -- debian-science-maintainers mailing list debian-science-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
