Hello community, here is the log from the commit of package iscan-free for openSUSE:Factory checked in at 2012-10-07 19:04:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iscan-free (Old) and /work/SRC/openSUSE:Factory/.iscan-free.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iscan-free", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/iscan-free/iscan-free.changes 2012-05-25 16:16:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iscan-free.new/iscan-free.changes 2012-10-07 19:04:22.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 4 11:46:42 UTC 2012 - [email protected] + +- build also against libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- iscan-free-libpng15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iscan-free.spec ++++++ --- /var/tmp/diff_new_pack.FPJPlW/_old 2012-10-07 19:04:23.000000000 +0200 +++ /var/tmp/diff_new_pack.FPJPlW/_new 2012-10-07 19:04:23.000000000 +0200 @@ -30,7 +30,7 @@ BuildRequires: update-desktop-files Url: http://www.avasys.jp/english/linux_e/index.html Summary: Free Image Scan Version with epkowa Driver for Epson Scanners -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Group: Hardware/Scanner # How to make Source0: # Get the matching source from the iscan package (iscan_2.10.0-1.tar.bz2) @@ -63,6 +63,7 @@ Patch10: adapt-man-for-free.patch Patch11: fix-link.patch Patch12: iscan-automake.patch +Patch13: iscan-free-libpng15.patch # Have Epson Avasys' release number at the end of the SUSE package Version: Version: 2.10.0.1 Release: 0 @@ -99,6 +100,7 @@ %patch10 %patch11 -p1 %patch12 -p1 +%patch13 # Distinguish the no longer supported models in the description file # but do not remove them because otherwise they would be no longer shown in YaST @@ -312,6 +314,12 @@ + + + + + + ++++++ iscan-free-libpng15.patch ++++++ Index: lib/pngstream.cc =================================================================== --- lib/pngstream.cc.orig +++ lib/pngstream.cc @@ -54,7 +54,11 @@ pngstream::~pngstream () set_error_handler (_png, _info); lib->write_flush (_png); // just in case +#if PNG_LIBPNG_VER > 10499 + if (_v_sz == lib->get_current_row_number(_png)) { +#else if (_png->num_rows == _png->flush_rows) { +#endif lib->write_end (_png, _info); } lib->destroy_write_struct (&_png, &_info); @@ -120,6 +124,9 @@ pngstream::is_usable () funcsym (create_info_struct); funcsym (destroy_write_struct); funcsym (init_io); +#if PNG_LIBPNG_VER > 10499 + funcsym (get_current_row_number); +#endif funcsym (set_IHDR); funcsym (set_pHYs); funcsym (set_invert_mono); @@ -133,6 +140,9 @@ pngstream::is_usable () && lib->create_info_struct && lib->destroy_write_struct && lib->init_io +#if PNG_LIBPNG_VER > 10499 + && lib->get_current_row_number +#endif && lib->set_IHDR && lib->set_pHYs && lib->set_invert_mono Index: lib/pngstream.hh =================================================================== --- lib/pngstream.hh.orig +++ lib/pngstream.hh @@ -84,6 +84,10 @@ private: png_structpp, png_infopp); fundecl (void, init_io, png_structp, FILE *); +#if PNG_LIBPNG_VER > 10499 + fundecl (png_uint_32, get_current_row_number, + png_structp); +#endif fundecl (void, set_IHDR, png_structp, png_infop, png_uint_32, png_uint_32, int, int, int, int, int); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
