[gentoo-commits] proj/sci:master commit in: sci-biology/staden/files/, sci-biology/staden/

["Martin Mokrejs" <mmokrejs@fold.natur.cuni.cz>]

commit:     60fc8171be2882a2861b36fab0c7333cc349fb57
Author:     Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
AuthorDate: Fri Mar 25 16:22:20 2016 +0000
Commit:     Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
CommitDate: Fri Mar 25 16:22:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=60fc8171

sci-biology/staden: rename patch files; remove unnecessary patch

Package-Manager: portage-2.2.26

 ...9-ldflags.patch => staden-2.0.0_beta10-ldflags.patch} |  0
 ...0_beta9-zlib.patch => staden-2.0.0_beta10-zlib.patch} |  0
 .../staden/files/staden-2.0.0_beta9-libpng-1.5.patch     | 16 ----------------
 sci-biology/staden/staden-2.0.0_beta10.ebuild            |  1 -
 4 files changed, 17 deletions(-)

diff --git a/sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch b/sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch
similarity index 100%
rename from sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch
rename to sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch

diff --git a/sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch b/sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch
similarity index 100%
rename from sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch
rename to sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch

diff --git a/sci-biology/staden/files/staden-2.0.0_beta9-libpng-1.5.patch b/sci-biology/staden/files/staden-2.0.0_beta9-libpng-1.5.patch
deleted file mode 100644
index 50694a8..0000000
--- a/sci-biology/staden/files/staden-2.0.0_beta9-libpng-1.5.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- tk_utils/tkTrace.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tk_utils/tkTrace.c b/tk_utils/tkTrace.c
-index beeb478..42a4e11 100644
---- a/tk_utils/tkTrace.c
-+++ b/tk_utils/tkTrace.c
-@@ -2123,7 +2123,7 @@ int drawable_to_png(DNATrace *t, FILE *fp, Display *disp, Drawable d,
- 	goto error;
- 
-     /* PNG requires setjmp/longjmp to be used */
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp (png_jmpbuf (png_ptr)))
- 	goto error;
- 
-     /* Create the info bits */

diff --git a/sci-biology/staden/staden-2.0.0_beta10.ebuild b/sci-biology/staden/staden-2.0.0_beta10.ebuild
index b9cfef0..d14c042 100644
--- a/sci-biology/staden/staden-2.0.0_beta10.ebuild
+++ b/sci-biology/staden/staden-2.0.0_beta10.ebuild
@@ -45,7 +45,6 @@ AUTOTOOLS_IN_SOURCE_BUILD=1
 
 PATCHES=(
 	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-libpng-1.5.patch
 	"${FILESDIR}"/${P}-zlib.patch )
 
 src_prepare() {