Added a patch to fix compilation with libpng15 (bug #383721)

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

4 files changed, 57 insertions, 10 deletions

diff --git a/sci-biology/ncbi-tools++/ChangeLog b/sci-biology/ncbi-tools++/ChangeLog
index d805b171cfa9..b8367ea39859 100644
--- a/sci-biology/ncbi-tools++/ChangeLog
+++ b/sci-biology/ncbi-tools++/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/ncbi-tools++
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.20 2011/05/05 13:05:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ChangeLog,v 1.21 2011/09/23 09:43:25 polynomial-c Exp $
+
+  23 Sep 2011; Lars Wendler <polynomial-c@gentoo.org>
+  ncbi-tools++-2010.06.15-r1.ebuild,
+  +files/ncbi-tools++-2010.06.15-libpng15.patch:
+  non-maintainer commit: Added a patch to fix compilation with libpng15 (bug
+  #383721).
 
   05 May 2011; Justin Lecher <jlec@gentoo.org>
   ncbi-tools++-2010.06.15-r1.ebuild,
diff --git a/sci-biology/ncbi-tools++/Manifest b/sci-biology/ncbi-tools++/Manifest
index 74f6e695324f..7cc34f40eb63 100644
--- a/sci-biology/ncbi-tools++/Manifest
+++ b/sci-biology/ncbi-tools++/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX ncbi-tools++-2009.05.15-asneeded.patch 3620 RMD160 393db694f0824b0d47571e3b64250b8398c33e58 SHA1 541f00f4d2170d9bb4721468f1c350dcc92552bb SHA256 71a4b2040417a9bfaa7254b5c6668d09ec69f5836a372f1b2bbc938f41ff7657
 AUX ncbi-tools++-2009.05.15-gcc44.patch 554 RMD160 57a23cbaad59b6011124f684db55f4ac2e4a43ab SHA1 7ed63addba554bf87a347d25ea2d4ea6b6552a1a SHA256 ddc2379ff636851e1bb4fb601930ee926c396819e06812b1ba76da001255d5c6
 AUX ncbi-tools++-2010.06.15-gcc46.patch 2304 RMD160 bec40073066b10a3ca95f5a125dccab2110eaaf4 SHA1 ff0675b263ba7f9f5e7abd33544e9b2fc88ff11b SHA256 ef20fbecab4c7223dd52855015b8cceed2599120ee0d99cf1dfbdb347725a199
+AUX ncbi-tools++-2010.06.15-libpng15.patch 1241 RMD160 3e8e55bd4ad309a7eda3517a36196d6a9ae4653e SHA1 8fcdd288fa5e4713331acbeb2dae580d277551fd SHA256 123e85198251ea21230f8afea0cc12b4aaa04adc9f4e1d421b3c14811c4b8f53
 DIST ncbi-tools++-2010.06.15-asneeded.patch.xz 4948 RMD160 ee82d427be00e029066126898db44d76bc2cbe0d SHA1 71cef7198fcd52eca16cb76ae7f8abd084cbd437 SHA256 8a39b46e1ef6ddae57151c3ffbb7da952e4cb6eea0f76a4ac74de981d88cb873
 DIST ncbi_cxx--Jun_15_2010.tar.gz 17297248 RMD160 35e2ffbe2f37856eb4368e7e98c48c2721848060 SHA1 43c007fb6b3a72389ca33e884c6abd7ad27dbbd0 SHA256 eb24230a9afe9bcf3c52aa6d5d9545dca04649a2569a1bb832ace54aec9d3c54
-EBUILD ncbi-tools++-2010.06.15-r1.ebuild 1831 RMD160 f65b05e2ae933cf73dad4967fa45433a22e7fa62 SHA1 51902ec024597ed97877ca145e45d7dbc3bdcb09 SHA256 506da00a3f1dffc025c97317aded8e6e71102bb7fdeefbe4b30c6e23f876a009
+EBUILD ncbi-tools++-2010.06.15-r1.ebuild 1877 RMD160 7992e916136493b3011b5dc520e5d84ca87db672 SHA1 9103cacde3683fe650b2bca1f98c540b9199a336 SHA256 10fae4b0802438cc23b8de9b146692c5493b00eae4a61537a434058c1eb3a33d
 EBUILD ncbi-tools++-2010.06.15.ebuild 1653 RMD160 6653b7ca063cd7abaaa2a1ccba6a2fc4a0cae841 SHA1 0f93842404e562a127179db6ab52ea7f84c38801 SHA256 06b52157803e3f3c7c8bc78d875c26828ff94b514d7fe651ff67999b29e24c43
-MISC ChangeLog 3917 RMD160 7819bb35ecebdf1c0f114ecc11a9b6d0d16e74c4 SHA1 edc308e14c5e232918f20f2564302f96cfd6956d SHA256 66d0382d0fede8906541a3e162ba411faa63482dab4897adf8f2a710f6236e7b
+MISC ChangeLog 4155 RMD160 78addba391bb217a4d93c0bf6f4b933126abf650 SHA1 66ac882154b9d024cb146ecb30109e17fbc757df SHA256 57ead376b38cf3bd682370cffd721f1cb06edbef6d95f243b2b93e8159a734bb
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3CoLUACgkQgAnW8HDreRaygwCfR+eB+F5T4NTSYCZvJGZxyiNm
-EvcAoMl8ezDnZYhFYMsWiw/G6ltMwxCv
-=V/zv
+iQIcBAEBCgAGBQJOfFTCAAoJEPiazRVxLXTFlsgQAKJRmKEw2xp3BUShG7y1g+Le
+WPTHeepask2TJCT7tW2CfLzxI+k9SzonRfbXGraXieAK5WAsZUGXp3VZur6cH/mL
+NtmnMjkCq/83lap4e4ATSzFwQGsim4E2AwS78k49Mr21eg2sZryhqK92M0Fju2pe
+nR2a1KORlpf3VTtDVRd4gUMSwGrwN9WH3MqDd2Jl8vzGhj46uU/TthznuZfVD8P7
+c0I/TBTM/qY1xU2zfsWw6PTnxJ+ZY/+ShXNY/FwKijTfkKmukgcHx1cCnglouLj2
+YuCKOHbRnriOh4N500r3KlEdmtn/HJEV6vDdikVlu5cpQ5nQJut7djDTlVjr5DrK
+Ht+J/5ccrn/T6UzvYXFt16tK6VYinhKHkB9ZLCHUdhUVtsV45GHdd/OBrd34WIdc
+W2WNVGJblPhRdf0CRR/EQkJ96s3Ag+Hzxlh1Ye0bCEX4SZLfmwY0W7Ma38nk1HfH
+RW/WW6VpDQQ+9p9ohMKuMkB6aYr3YmIBkJE1uLombGtHzFRdWccBbIavgK7fEybR
+z/gJDn5vmtVoTCS84qklvK1925jESWwfd3oSTvuTbn6gYaoRhmG6uMlKhUuOBE9k
+wz2OBn4FuaxtNg1nzsCni1GoCj6fC+EMg+CSf1lEkZ2yb7kK7hMlFvha0GdcVwpU
+6u1a1Czo7dKhl11qJdkY
+=27mZ
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-libpng15.patch b/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-libpng15.patch
new file mode 100644
index 000000000000..d0f9c80894bf
--- /dev/null
+++ b/sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-libpng15.patch
@@ -0,0 +1,29 @@
+Index: ncbi_cxx--Jun_15_2010/src/util/image/image_io_png.cpp
+===================================================================
+--- ncbi_cxx--Jun_15_2010.orig/src/util/image/image_io_png.cpp
++++ ncbi_cxx--Jun_15_2010/src/util/image/image_io_png.cpp
+@@ -34,6 +34,7 @@
+ #include <util/image/image.hpp>
+ #include <util/image/image_exception.hpp>
+ #include <util/error_codes.hpp>
++#include <zlib.h>
+ 
+ #define NCBI_USE_ERRCODE_X   Util_Image
+ 
+@@ -177,11 +178,11 @@ static void s_PngReadValidate(png_struct
+                               size_t& x, size_t& y, size_t& w, size_t& h)
+ {
+     // store and validate our image's parameters
+-    width        = info_ptr->width;
+-    height       = info_ptr->height;
+-    depth        = info_ptr->channels;
+-    png_byte color_type = info_ptr->color_type;
+-    png_byte bit_depth  = info_ptr->bit_depth;
++    width        = png_get_image_width(png_ptr,info_ptr);
++    height       = png_get_image_height(png_ptr,info_ptr);
++    depth        = png_get_channels(png_ptr,info_ptr);
++    png_byte color_type = png_get_color_type(png_ptr,info_ptr);
++    png_byte bit_depth  = png_get_bit_depth(png_ptr,info_ptr);
+ 
+     // we support only RGB and RGBA images
+     if ( color_type != PNG_COLOR_TYPE_RGB  &&
diff --git a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild b/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild
index 9e3be00d5a52..2b5a6cd58f3c 100644
--- a/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild
+++ b/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.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/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild,v 1.2 2011/05/05 13:05:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild,v 1.3 2011/09/23 09:43:25 polynomial-c Exp $
 
 EAPI="3"
 
@@ -36,7 +36,8 @@ src_prepare() {
 		src/build-system/configure || die
 	epatch \
 		"${FILESDIR}"/${P}-gcc46.patch \
-		"${WORKDIR}"/${P}-asneeded.patch
+		"${WORKDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_configure() {