diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2011-09-23 09:43:25 +0000 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2011-09-23 09:43:25 +0000 |
| commit | 6d265a1118903d2f8b4f38615ed5a9387abe7f0a (patch) | |
| tree | 1bcb9e297e11990e8fa6571096df71c278be25a6 | |
| parent | Remove vulnerable versions, security bugs #378345 and #384097. Also remove ol... (diff) | |
| download | gentoo-2-6d265a1118903d2f8b4f38615ed5a9387abe7f0a.tar.gz gentoo-2-6d265a1118903d2f8b4f38615ed5a9387abe7f0a.tar.bz2 gentoo-2-6d265a1118903d2f8b4f38615ed5a9387abe7f0a.zip | |
Added a patch to fix compilation with libpng15 (bug #383721)
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
| -rw-r--r-- | sci-biology/ncbi-tools++/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-biology/ncbi-tools++/files/ncbi-tools++-2010.06.15-libpng15.patch | 29 | ||||
| -rw-r--r-- | sci-biology/ncbi-tools++/ncbi-tools++-2010.06.15-r1.ebuild | 5 |
3 files changed, 39 insertions, 3 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++/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() { |