Add patch to fix building with libpng 1.5. Thanks to Stefano for the patch, closes bug #419729.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

4 files changed, 73 insertions, 5 deletions

diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index af87ae1a9f8f..0d7764545bc4 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/iscan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.49 2012/06/04 21:11:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.50 2012/07/01 12:49:08 flameeyes Exp $
+
+  01 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/iscan-2.28.1.3+libpng-1.5.patch, iscan-2.28.1.3.ebuild:
+  Add patch to fix building with libpng 1.5. Thanks to Stefano for the patch,
+  closes bug #419729.
 
 *iscan-2.28.1.3 (04 Jun 2012)
 
@@ -231,4 +236,3 @@
   24 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org> +metadata.xml,
   +iscan-1.17.0.ebuild:
   initial commit.
-
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 4c6c9057c3e2..051710339959 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -1,11 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX iscan-2.25.0-drop-ltdl.patch 2121 RMD160 6be869f3dac12c136ed91593fcff712a6e6b5a56 SHA1 736d09325fef5153a9fa1173d8ed57c430fb91bf SHA256 690b675dc3ac242131809fc5bec79f7542be2165216aaa2da5f7f9e4a88aff47
 AUX iscan-2.25.0-fix-g++-test.patch 523 RMD160 8844c0e26d99dff531496a8ce1f2a6e9ab7c7915 SHA1 fc31881a1cb3c0baddbee5115c870f3bf42842b2 SHA256 3a5e8fb2c765d20de0233592bf1c0c41a703c7c5e185228c613dcd5ac70b2339
 AUX iscan-2.26.2-libpng15.patch 1490 RMD160 72fd4c217ab56992e391ffeeeb39cd185a4b13de SHA1 1a375eadbd6e0597d2f3395973e174360314c0b3 SHA256 9062d329eb1af1c6c1ac7bba187d83d6551b13472acaefd1b9f05aacd0496f32
+AUX iscan-2.28.1.3+libpng-1.5.patch 1466 RMD160 ba12c24efbc4cd3bcd04a48f6164d67635545a01 SHA1 dee17c18460251d3fa49a8720c15883ee457c2e3 SHA256 4d0679a7e9d5b5cf247fd1559474bd26284841c1d18573a0bf0d08d12406c713
 AUX iscan-usb.sh 826 RMD160 ebf81c44b9e4f1f040a276e3f918662cd93a5f10 SHA1 90e0205dad199aeb87cfb89c7d89dd8737702001 SHA256 8ece8711de7ebfd7d9266e96d8cdf4c7bc12ad52ab212590162526d4af669798
 DIST iscan_2.26.2-1.tar.gz 1106921 RMD160 663a69c4e58625d48503af34f0a6a2302d76750a SHA1 0d0f85fb8b7f1a89290fec799a769351d6491240 SHA256 e528070f588fe6166c321610dcdeed6c7cf8110152303fdbf03240e68a593659
 DIST iscan_2.28.1-3.tar.gz 1195938 RMD160 cb819809c9988ee9bf365a59f0761ddcbbf14c96 SHA1 80e92d6820d4c06ca1242feb1ebecdd2d64bcee0 SHA256 97fbaf4d66697762a32768b96f3ecb59c3582b6fdc1c1919119f8b73aa2d3b13
 DIST userg_revL_e.pdf 574224 RMD160 a2c8e17e436d009cf74b6ca6ac6b4c23ace2ce1e SHA1 c696f1a2a905f29ca83d8118f0ea34f5f77656d5 SHA256 e68a45d600f702311d10a0e13d42c5b32036df172e8f07728604291b823ec876
 EBUILD iscan-2.26.2.ebuild 4349 RMD160 6a45f8a8272b419b16fde33aba451319ad7e0840 SHA1 6153af9299660901dcf3a2b3afbe29865d9dc6f3 SHA256 3de863d05cc004e529186a1782a59e320be1b5ece3d4457806d4a923bac6d52b
-EBUILD iscan-2.28.1.3.ebuild 4366 RMD160 4309e5139d7583becaf13a4b0d03051f4926d845 SHA1 a6f8d2b699df3b9a79e0fa8e92ba432b1b6bedbe SHA256 b7818af68bd74f2dd6276f274937eb6db492569bbeeecf5ca475dc5a86612d18
-MISC ChangeLog 8673 RMD160 c7c3fb0078a50b78b332b78024b36b70ab7c383a SHA1 14f7b569b94e328ccda360d0b82172182ac9fbb0 SHA256 02917567192e6b4d59a4c07e9c3a2fb0e2dc62e0407afc254bcdc12644fce9d8
+EBUILD iscan-2.28.1.3.ebuild 4420 RMD160 0cdef2ab5ce375a063c055b63d761357e57807b5 SHA1 7067209b9bc516e72441c7602d9a9c24cbdf7ae8 SHA256 d97960d8a2349e2ae16313b2418a9cb47ff31adb5b22fcbef2a6c62505ba86cf
+MISC ChangeLog 8894 RMD160 9dcc2faa14b425b68a9189c4bacb1c151e1f4358 SHA1 9e6072faeb3691ef317499a2d36296d4bc71dfba SHA256 9d450a2d61eccf8852eb716c789c72fdd4dc42f7a7501adba8977698bbb8e83e
 MISC metadata.xml 652 RMD160 df66e2d4acff70d1d9df37decc95a3c12e6d8148 SHA1 af83ba8a0303bc36ddeac11fe0f9a3c6b5d9aa36 SHA256 2eb198fd36ab27077883685af440e0fdfc372c05b4f2df7b8d27ee51eb9bda63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJP8EdNAAoJEBzRPIrUMBNCp4wH/2IM43MpK1+3EOI+u0QHJ5H5
+XTgV8PO/4Dp5EgmqzsAx9saLoHYJDcZsMpbRFroLL9tbXVcHtMI7c6VBQeYT07Pc
+oyKNR7rUjicqwJjvlbgMGoDmxZtMytZRVpUXAv5rxEm+nOC6KbWWt/WXSCmweM39
+svPsAolF4Te2HzD2ZhhCfNNdIT97NqJ82IBmaliPxa3wpmJrf08wr+zP/YidFEyl
+xv/lp9Rda80gijVKiu+ip6G0E5a00TxcOI95WObTPLTNIwqKnsqqyAM5UDwAwCwT
+mhwdf7VpNzO/XYJeYUTue7k3ta44P7hsvG2K4xDWgWkDqineBg8Sms86v205HK8=
+=SFcE
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
new file mode 100644
index 000000000000..7205028d8248
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.28.1.3+libpng-1.5.patch
@@ -0,0 +1,48 @@
+--- lib/pngstream.cc	2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.cc	2012-02-06 03:06:22.000000000 +0100
+@@ -83,7 +83,12 @@
+ #if HAVE_PNG_H
+     set_error_handler (_png, _info);
+ 
++/* when not interlacing (ie, only one pass), number of rows is image height:  _v_sz */
++#if PNG_LIBPNG_VER > 10499
++     if (!_footer && _v_sz == lib->get_current_row_number(_png))
++#else
+     if (_header && !_footer && _png->num_rows == _png->flush_rows)
++#endif
+       {
+         lib->write_end (_png, _info);
+         _footer = true;
+@@ -167,6 +172,9 @@
+     funcsym (write_row);
+     funcsym (write_flush);
+     funcsym (write_end);
++#if PNG_LIBPNG_VER > 10499
++    funcsym (get_current_row_number);
++#endif
+ 
+     if (lib->access_version_number
+         && lib->create_write_struct
+@@ -176,6 +184,9 @@
+         && lib->set_IHDR
+         && lib->set_pHYs
+         && lib->set_invert_mono
++#if PNG_LIBPNG_VER > 10499
++        && lib->get_current_row_number
++#endif
+         && lib->write_info
+         && lib->write_row
+         && lib->write_flush
+--- lib/pngstream.hh	2011-12-01 02:30:53.000000000 +0100
++++ lib/pngstream.hh	2012-02-06 03:09:09.000000000 +0100
+@@ -108,6 +108,10 @@
+                png_structp);
+       fundecl (void, write_end,
+                png_structp, png_infop);
++#if PNG_LIBPNG_VER > 10499
++      fundecl (png_uint_32, get_current_row_number,
++               png_structp);
++#endif
+ #endif /* HAVE_PNG_H */
+     };
+     static png_lib_handle *lib;
diff --git a/media-gfx/iscan/iscan-2.28.1.3.ebuild b/media-gfx/iscan/iscan-2.28.1.3.ebuild
index 625dac5d026a..16a1b47b2933 100644
--- a/media-gfx/iscan/iscan-2.28.1.3.ebuild
+++ b/media-gfx/iscan/iscan-2.28.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.28.1.3.ebuild,v 1.1 2012/06/04 21:11:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.28.1.3.ebuild,v 1.2 2012/07/01 12:49:08 flameeyes Exp $
 
 EAPI="4"
 
@@ -82,6 +82,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/iscan-2.25.0-drop-ltdl.patch
 	epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
+	epatch "${FILESDIR}"/iscan-2.28.1.3+libpng-1.5.patch
 
 	eautoreconf
 }