aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2016-03-25 17:22:20 +0100
committerMartin Mokrejš <mmokrejs@fold.natur.cuni.cz>2016-03-25 17:22:20 +0100
commit60fc8171be2882a2861b36fab0c7333cc349fb57 (patch)
tree7de7f05f139406ff0db648dc1f9578c213832d55
parentsci-biology/fgap: fix typo in a package name (diff)
downloadsci-60fc8171be2882a2861b36fab0c7333cc349fb57.tar.gz
sci-60fc8171be2882a2861b36fab0c7333cc349fb57.tar.bz2
sci-60fc8171be2882a2861b36fab0c7333cc349fb57.zip
sci-biology/staden: rename patch files; remove unnecessary patch
Package-Manager: portage-2.2.26
-rw-r--r--sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch (renamed from sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch)0
-rw-r--r--sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch (renamed from sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch)0
-rw-r--r--sci-biology/staden/files/staden-2.0.0_beta9-libpng-1.5.patch16
-rw-r--r--sci-biology/staden/staden-2.0.0_beta10.ebuild1
4 files changed, 0 insertions, 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
index 735feb315..735feb315 100644
--- a/sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch
+++ b/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
index 39537604e..39537604e 100644
--- a/sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch
+++ b/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 50694a8eb..000000000
--- 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 b9cfef0a5..d14c04250 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() {