diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2011-08-11 21:36:06 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2011-08-11 21:36:06 +0000 |
| commit | ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7 (patch) | |
| tree | 1e6751309d1894b2f70c1984e76346501b505e9b /sci-biology/arb | |
| parent | Move dev-libs/ding-libs from rion-overlay (diff) | |
| download | gentoo-2-ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7.tar.gz gentoo-2-ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7.tar.bz2 gentoo-2-ed4ddcfa7c6bbcde45e5ba8c69d1b31193e742c7.zip | |
Add missing dependency on sys-process/time and fix building with libpng-1.5 wrt #378353. Thanks to Diego Elio Pettenò <flameeyes@gentoo.org> for the report and Samuli Suominen <ssuominen@gentoo.org> for the patch
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology/arb')
| -rw-r--r-- | sci-biology/arb/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-biology/arb/arb-5.2.ebuild | 12 | ||||
| -rw-r--r-- | sci-biology/arb/files/5.2-libpng15.patch | 45 |
3 files changed, 59 insertions, 6 deletions
diff --git a/sci-biology/arb/ChangeLog b/sci-biology/arb/ChangeLog index 06a7796d0602..b9d78830b2e0 100644 --- a/sci-biology/arb/ChangeLog +++ b/sci-biology/arb/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-biology/arb # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/ChangeLog,v 1.5 2011/06/20 07:34:40 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/ChangeLog,v 1.6 2011/08/11 21:36:06 xarthisius Exp $ + + 11 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> + +files/5.2-libpng15.patch, arb-5.2.ebuild: + Add missing dependency on sys-process/time and fix building with libpng-1.5 + wrt #378353. Thanks to Diego Elio Pettenò <flameeyes@gentoo.org> for the + report and Samuli Suominen <ssuominen@gentoo.org> for the patch *arb-5.2 (20 Jun 2011) diff --git a/sci-biology/arb/arb-5.2.ebuild b/sci-biology/arb/arb-5.2.ebuild index 9e6c93b9a69e..cded5698b7ee 100644 --- a/sci-biology/arb/arb-5.2.ebuild +++ b/sci-biology/arb/arb-5.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/sci-biology/arb/arb-5.2.ebuild,v 1.2 2011/07/15 15:55:45 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.2.ebuild,v 1.3 2011/08/11 21:36:06 xarthisius Exp $ EAPI=4 @@ -17,8 +17,7 @@ LICENSE="arb" IUSE="+opengl" KEYWORDS="~amd64 ~x86" -DEPEND=" - app-text/sablotron +CDEPEND="app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx @@ -29,7 +28,9 @@ DEPEND=" media-libs/glew media-libs/freeglut media-libs/mesa[motif] )" -RDEPEND="${DEPEND} +DEPEND="${CDEPEND} + sys-process/time" +RDEPEND="${CDEPEND} sci-visualization/gnuplot" # Recommended: libmotif3 gv xfig xterm treetool java @@ -42,7 +43,8 @@ src_prepare() { epatch \ "${WORKDIR}"/${P}-linker.patch \ "${FILESDIR}"/5.1-libs.patch \ - "${FILESDIR}"/5.1-bfr-overflow.patch + "${FILESDIR}"/5.1-bfr-overflow.patch \ + "${FILESDIR}"/${PV}-libpng15.patch sed -i \ -e 's/all: checks/all:/' \ -e "s/GCC:=.*/GCC=$(tc-getCC) ${CFLAGS}/" \ diff --git a/sci-biology/arb/files/5.2-libpng15.patch b/sci-biology/arb/files/5.2-libpng15.patch new file mode 100644 index 000000000000..3d750e76efe3 --- /dev/null +++ b/sci-biology/arb/files/5.2-libpng15.patch @@ -0,0 +1,45 @@ +Fix building with libpng-1.5 + +https://bugs.gentoo.org/show_bug.cgi?id=378353 + +Patch written by Samuli Suominen <ssuominen@gentoo.org> +--- a/GL/glpng/glpng.c ++++ b/GL/glpng/glpng.c +@@ -285,7 +285,7 @@ + endinfo = png_create_info_struct(png); + + // DH: added following lines +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct(&png, &info, &endinfo); + return 0; +@@ -390,7 +390,7 @@ + endinfo = png_create_info_struct(png); + + // DH: added following lines +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + { + png_destroy_read_struct(&png, &info, &endinfo); + return 0; +@@ -569,7 +569,7 @@ + #define ALPHA *q + + switch (trans) { +- case PNG_CALLBACK: ++ case PNG_CALLBACKT: + FORSTART + ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b); + FOREND +--- a/GL/glpng/glpng.h ++++ b/GL/glpng/glpng.h +@@ -57,7 +57,7 @@ + #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS + + /* Transparency parameters */ +-#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */ ++#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */ + #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */ + #define PNG_SOLID -1 /* No transparency */ + #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */ |