From b585d3193c7a973af4d92581e794c13023f56e04 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 30 Sep 2011 17:58:25 +0000 Subject: [PATCH] Fix building with libpng15 wrt #383799 by Ian Stakenvicius (patch pending upstream review) Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- media-gfx/iscan/ChangeLog | 7 ++- media-gfx/iscan/Manifest | 19 ++++--- .../iscan/files/iscan-2.26.2-libpng15.patch | 51 +++++++++++++++++++ media-gfx/iscan/iscan-2.26.2.ebuild | 7 +-- 4 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 media-gfx/iscan/files/iscan-2.26.2-libpng15.patch diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog index 1c3d924b318f..bdfada044ebd 100644 --- a/media-gfx/iscan/ChangeLog +++ b/media-gfx/iscan/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/iscan # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.42 2011/04/23 18:26:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.43 2011/09/30 17:58:25 ssuominen Exp $ + + 30 Sep 2011; Samuli Suominen iscan-2.26.2.ebuild, + +files/iscan-2.26.2-libpng15.patch: + Fix building with libpng15 wrt #383799 by Ian Stakenvicius (patch pending + upstream review) 23 Apr 2011; Diego E. Pettenò iscan-2.26.2.ebuild: Drop dependency over libieee1284 (no longer used by iscan), add missing diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest index 3cb3f5428bcb..26eb29e75915 100644 --- a/media-gfx/iscan/Manifest +++ b/media-gfx/iscan/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX iscan-2.11.0-gcc43.patch 249 RMD160 8d10c5a4105f7ba520948fa5ff630c07907f0a2f SHA1 590bb8e964a8c920ef302e15264bc2ee9bc79ad9 SHA256 a5babcf81aa2023a15e8a58ae08e2b3c65d9ca9767ccd5796a67eaf75ed9cdbd AUX iscan-2.11.0-glibc210.patch 2888 RMD160 9d513dcb7f1740e2883167f604c2e0de495e544d SHA1 14d2ecb3ce79ae1edfa958a0d758f03a5026e2f6 SHA256 2082bb0dcb2591aca37331dae6f19983a5877261046b422f448586257b1b1f03 @@ -9,6 +9,7 @@ AUX iscan-2.21.0-fix-g++-test.patch 523 RMD160 8844c0e26d99dff531496a8ce1f2a6e9a AUX iscan-2.21.0-noinst-stuff.patch 535 RMD160 84155f0f83e6cfd82e892234fe5ef1ae328022e2 SHA1 8d341a0548fb11874c0996d05a787e95794954d4 SHA256 a9b600f4891d3ff47ab1ab2efb5ae2afae1f00b6bf67040796b8ab4c35773ed6 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-usb.sh 826 RMD160 ebf81c44b9e4f1f040a276e3f918662cd93a5f10 SHA1 90e0205dad199aeb87cfb89c7d89dd8737702001 SHA256 8ece8711de7ebfd7d9266e96d8cdf4c7bc12ad52ab212590162526d4af669798 DIST iscan-plugin-cx4400-2.0.0-0.c2.i386.rpm 94530 RMD160 df07c891df3429d94676307ee61816fab9a7fc28 SHA1 08f4e8c7b74781fccad3d92ca6b4f42fe1fee3ba SHA256 c8c073679dad0febadb8a19cebd25676f2a5897f4e4a3f34ee2333f0513e3ba8 DIST iscan-plugin-gt-7200-1.0.0-1.c2.i386.rpm 62336 RMD160 7862ae8f8e4362ba9535b9d492e742d9716da91d SHA1 708527915e9005139352308c2ad1a0c5c570fb17 SHA256 11789e2074670b1098cea9366b3e33bb72ce316c0ced6e09086f3a13eeccb86f @@ -30,15 +31,17 @@ DIST userg_revL_e.pdf 574224 RMD160 a2c8e17e436d009cf74b6ca6ac6b4c23ace2ce1e SHA EBUILD iscan-2.11.0.ebuild 9621 RMD160 cb4563dc2f987fa37a6569b111427bf2a740961f SHA1 82425c85ae4224385f9ee3a8355fea233bd0676b SHA256 e5c37da0a75f33fabf55535f8b01b4461a6376e62a9670c047f44ed78774d7b7 EBUILD iscan-2.21.0.ebuild 5321 RMD160 68b639b26960e6147fc5b2c9367764dfd0414a53 SHA1 8412f24c917230a96704d2ffeb33a989b712c811 SHA256 630612924d9b8574179148abfde5b00eb9d53fb19d005cd74ffd49ff6a3f7718 EBUILD iscan-2.25.0.ebuild 4294 RMD160 58f1e02cfc07d21e686a9e091411207dedf21df8 SHA1 017a239f8adf47635e7f0dfd1df0de51eda7ea7c SHA256 b36efbd4a667eed9fdcf8a60db18b8457a1a82a3a0d3a96f3c316dea7a0bdbfe -EBUILD iscan-2.26.2.ebuild 4310 RMD160 2c7089207ffc281fb3baa170c947f9d19568ce8e SHA1 ac5e0eb2f244d3557f035d86f85c0cf2117227e9 SHA256 4087cba72cb05de8b73eed2d25a5df6bc5350595dd5e7f9e6e6c20de140141b1 -MISC ChangeLog 7543 RMD160 ab86e9522536c59719729db6563bd6c76dd95115 SHA1 984e86e7757f393cdf6347687cdc30b0a87d1287 SHA256 c698706dc1858f8e65292b7075bb3bca369fa2334f00ba8922debb314d90701d +EBUILD iscan-2.26.2.ebuild 4360 RMD160 b13b49cee6961598eb5014a7f3501252532c53a2 SHA1 dfd486fd9bbbd969b41373169f7681484039ffab SHA256 e218148eb28bb37ecab20da49d24a3615a083fe909b2692ca4301d8b74135ada +MISC ChangeLog 7752 RMD160 f7677c1cc450318d543718edf5f65f7bb7d26208 SHA1 7fdb595a2d6303f104e83a072bb659e207cc6ca7 SHA256 0f88520f05245847bf63c922d89a613ace4c82af716c1aad900cdac05d9f5e7e MISC metadata.xml 652 RMD160 df66e2d4acff70d1d9df37decc95a3c12e6d8148 SHA1 af83ba8a0303bc36ddeac11fe0f9a3c6b5d9aa36 SHA256 2eb198fd36ab27077883685af440e0fdfc372c05b4f2df7b8d27ee51eb9bda63 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59ovQACgkQfXuS5UK5QB0D8wP9HqQM2okenAHQ9/uQLridqc8U -W2MYWXwPpnxEV/u5ny52LYH8pIFyAOn7uu78s+xpd8bjn8poJ0FLtGPoFvB4ZAJL -nQ9hRBSTdmnQEwOh4NCY2uPsQMOUYVgxZAUErrj8T5MjRlxjHLYDz1bKGATRKUTM -hVYZXP9AdOQn89A+CfE= -=a9mN +iQEcBAEBAgAGBQJOhgNpAAoJEEdUh39IaPFNmSMIAJ/1GF+RbJNDAgbZhvJ15ZRs +vtHSM0vzwKZ51I7Rcbzjq90YmcX6HOaYc0E71UZZB1zZiHmrUejQnNeTrcseKr3g +1m0be7nJHnWb81SzuDBgaviDwePn651B+hJcpThMPoqVLUp8pGAikq4qTSDXTOVr +mfZWNewjBuHjWgxIGtXywES4U7pAqPgCW7TWMAMYBvtJGqQXb4LwjYcH3TMPTvj/ +Z4PIR4Xs80bbQ13A1xwfsDfmkVDsnKOvk6aB+x7RTuPFsTii69RZEpL6QTkTRMQW +04IT88Q21MsBJ8R8/i8B5dOiljGqA+S/cdZD+OvoCsz5+/AFENgsR46W5TEUkzk= +=dDKg -----END PGP SIGNATURE----- diff --git a/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch new file mode 100644 index 000000000000..1b89b735c23f --- /dev/null +++ b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch @@ -0,0 +1,51 @@ +http://bugs.gentoo.org/show_bug.cgi?id=383799#c13 +Upstream: http://www.avasys.jp/cgi-bin/lx/bbs/en/scanner-bbs/hyperbbs.cgi?mode=view;Code=5197 + +--- lib/pngstream.cc ++++ lib/pngstream.cc +@@ -76,7 +76,12 @@ + set_error_handler (_png, _info); + + lib->write_flush (_png); ++/* 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 (!_footer && _png->num_rows == _png->flush_rows) ++#endif + { + lib->write_end (_png, _info); + _footer = true; +@@ -161,6 +166,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 +@@ -170,6 +178,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 ++++ lib/pngstream.hh +@@ -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.26.2.ebuild b/media-gfx/iscan/iscan-2.26.2.ebuild index b36f271b9d78..f7bc1876ebe3 100644 --- a/media-gfx/iscan/iscan-2.26.2.ebuild +++ b/media-gfx/iscan/iscan-2.26.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.26.2.ebuild,v 1.2 2011/04/23 18:26:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.26.2.ebuild,v 1.3 2011/09/30 17:58:25 ssuominen Exp $ EAPI="2" @@ -79,8 +79,9 @@ src_prepare() { -e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac fi - epatch "${FILESDIR}/iscan-2.25.0-drop-ltdl.patch" - epatch "${FILESDIR}/iscan-2.25.0-fix-g++-test.patch" + epatch "${FILESDIR}"/iscan-2.25.0-drop-ltdl.patch + epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch + epatch "${FILESDIR}"/iscan-2.26.2-libpng15.patch eautoreconf } -- 2.26.2