commit: 535d49953c74af2bb58478979d77d5588acaca20 Author: Peter Levine <plevine457 <AT> gmail <DOT> com> AuthorDate: Thu Jun 22 05:25:12 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jun 25 16:59:09 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=535d4995
sci-biology/cufflinks: Fix building with GCC-6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=594904 Package-Manager: Portage-2.3.6, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4969 sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild | 3 ++- sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild b/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild index 9ff0a2c7111..3e89f70a498 100644 --- a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild +++ b/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,6 +22,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-samtools-legacy.patch "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-gcc6.patch ) src_prepare() { diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch new file mode 100644 index 00000000000..6ee9bcf456d --- /dev/null +++ b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc6.patch @@ -0,0 +1,14 @@ +--- a/src/lemon/error.h ++++ b/src/lemon/error.h +@@ -67,9 +67,9 @@ + } + + ExceptionMember& operator=(const ExceptionMember& copy) { +- if (ptr.get() == 0) return; ++ if (ptr.get() == 0) return *this; + try { +- if (!copy.valid()) return; ++ if (!copy.valid()) return *this; + *ptr = copy.get(); + } catch (...) {} + }
