From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E0CC259CA5 for ; Fri, 25 Mar 2016 16:22:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 976D021C008; Fri, 25 Mar 2016 16:22:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B68B21C008 for ; Fri, 25 Mar 2016 16:22:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D775340D17 for ; Fri, 25 Mar 2016 16:22:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D66C859 for ; Fri, 25 Mar 2016 16:22:39 +0000 (UTC) From: "Martin Mokrejs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Martin Mokrejs" Message-ID: <1458922940.60fc8171be2882a2861b36fab0c7333cc349fb57.mmokrejs@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/staden/files/, sci-biology/staden/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/staden/files/staden-2.0.0_beta10-ldflags.patch sci-biology/staden/files/staden-2.0.0_beta10-zlib.patch sci-biology/staden/files/staden-2.0.0_beta9-ldflags.patch sci-biology/staden/files/staden-2.0.0_beta9-libpng-1.5.patch sci-biology/staden/files/staden-2.0.0_beta9-zlib.patch sci-biology/staden/staden-2.0.0_beta10.ebuild X-VCS-Directories: sci-biology/staden/files/ sci-biology/staden/ X-VCS-Committer: mmokrejs X-VCS-Committer-Name: Martin Mokrejs X-VCS-Revision: 60fc8171be2882a2861b36fab0c7333cc349fb57 X-VCS-Branch: master Date: Fri, 25 Mar 2016 16:22:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6c156cf1-5230-4950-aff8-b47119ca2a8a X-Archives-Hash: b149761bbc4df1cf67d679e9cee4a546 commit: 60fc8171be2882a2861b36fab0c7333cc349fb57 Author: Martin Mokrejš fold natur cuni cz> AuthorDate: Fri Mar 25 16:22:20 2016 +0000 Commit: Martin Mokrejs fold natur cuni 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() {