From 60fc8171be2882a2861b36fab0c7333cc349fb57 Mon Sep 17 00:00:00 2001 From: Martin Mokrejš Date: Fri, 25 Mar 2016 17:22:20 +0100 Subject: sci-biology/staden: rename patch files; remove unnecessary patch Package-Manager: portage-2.2.26 --- .../staden/files/staden-2.0.0_beta10-ldflags.patch | 30 ++++++++++++++++++++++ .../staden/files/staden-2.0.0_beta10-zlib.patch | 16 ++++++++++++ .../staden/files/staden-2.0.0_beta9-ldflags.patch | 30 ---------------------- .../files/staden-2.0.0_beta9-libpng-1.5.patch | 16 ------------ .../staden/files/staden-2.0.0_beta9-zlib.patch | 16 ------------ sci-biology/staden/staden-2.0.0_beta10.ebuild | 1 - 6 files changed, 46 insertions(+), 63 deletions(-) create mode 100644 sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch create mode 100644 sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch delete mode 100644 sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch delete mode 100644 sci-biology/staden/files/staden-2.0.0_beta9-libpng-1.5.patch delete mode 100644 sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch diff --git a/sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch b/sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch new file mode 100644 index 000000000..735feb315 --- /dev/null +++ b/sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch @@ -0,0 +1,30 @@ + abi/Makefile | 2 +- + alf/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/abi/Makefile b/abi/Makefile +index 3c1f8fb..58b4353 100644 +--- a/abi/Makefile ++++ b/abi/Makefile +@@ -23,7 +23,7 @@ getABISampleName: $(OBJSSN) + $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSSN) $(LIBS) $(LIBSC) + + getABIdate: $(OBJSD) +- $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSD) $(IOUTILS_LIB) $(MISC_LIB) $(LIBSC) ++ $(CLD) $(LDFLAGS) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSD) $(IOUTILS_LIB) $(MISC_LIB) $(LIBSC) + + getABIcomment: $(OBJSC) + $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSC) $(LIBS) $(LIBSC) +diff --git a/alf/Makefile b/alf/Makefile +index 94b7480..ef41a26 100644 +--- a/alf/Makefile ++++ b/alf/Makefile +@@ -16,7 +16,7 @@ INCLUDES_E += $(MISC_INC) + ALFOBJ = alfsplit.o + + alfsplit: $(ALFOBJ) +- $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(ALFOBJ) $(LIBSC) ++ $(CLD) $(LDFLAGS) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(ALFOBJ) $(LIBSC) + + RSOBJ = $(ALFBIN)/2rs.o + diff --git a/sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch b/sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch new file mode 100644 index 000000000..39537604e --- /dev/null +++ b/sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch @@ -0,0 +1,16 @@ + gap5/zfio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gap5/zfio.c b/gap5/zfio.c +index 35da12a..1b628e4 100644 +--- a/gap5/zfio.c ++++ b/gap5/zfio.c +@@ -51,7 +51,7 @@ int zfpeek(zfp *zf) { + if (c != EOF) + ungetc(c, zf->fp); + } else { +- c = gzgetc(zf->gz); ++ c = gzgetc((gzFile)zf->gz); + if (c != EOF) + gzungetc(c, zf->gz); + } diff --git a/sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch b/sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch deleted file mode 100644 index 735feb315..000000000 --- a/sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch +++ /dev/null @@ -1,30 +0,0 @@ - abi/Makefile | 2 +- - alf/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/abi/Makefile b/abi/Makefile -index 3c1f8fb..58b4353 100644 ---- a/abi/Makefile -+++ b/abi/Makefile -@@ -23,7 +23,7 @@ getABISampleName: $(OBJSSN) - $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSSN) $(LIBS) $(LIBSC) - - getABIdate: $(OBJSD) -- $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSD) $(IOUTILS_LIB) $(MISC_LIB) $(LIBSC) -+ $(CLD) $(LDFLAGS) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSD) $(IOUTILS_LIB) $(MISC_LIB) $(LIBSC) - - getABIcomment: $(OBJSC) - $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(OBJSC) $(LIBS) $(LIBSC) -diff --git a/alf/Makefile b/alf/Makefile -index 94b7480..ef41a26 100644 ---- a/alf/Makefile -+++ b/alf/Makefile -@@ -16,7 +16,7 @@ INCLUDES_E += $(MISC_INC) - ALFOBJ = alfsplit.o - - alfsplit: $(ALFOBJ) -- $(CLD) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(ALFOBJ) $(LIBSC) -+ $(CLD) $(LDFLAGS) $(LDEXEFLAG)$@$(EXE_SUFFIX) $(SUBSYSTEMCONSOLE) $(ALFOBJ) $(LIBSC) - - RSOBJ = $(ALFBIN)/2rs.o - 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/files/staden-2.0.0_beta9-zlib.patch b/sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch deleted file mode 100644 index 39537604e..000000000 --- a/sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch +++ /dev/null @@ -1,16 +0,0 @@ - gap5/zfio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gap5/zfio.c b/gap5/zfio.c -index 35da12a..1b628e4 100644 ---- a/gap5/zfio.c -+++ b/gap5/zfio.c -@@ -51,7 +51,7 @@ int zfpeek(zfp *zf) { - if (c != EOF) - ungetc(c, zf->fp); - } else { -- c = gzgetc(zf->gz); -+ c = gzgetc((gzFile)zf->gz); - if (c != EOF) - gzungetc(c, zf->gz); - } 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() { -- cgit v1.2.3-65-gdbad