commit: e035eabc7b791b9854e53cf596b65e8330ef6e83 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Jun 30 14:58:58 2018 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Jun 30 14:59:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e035eabc
sci-biology/cufflinks: Fix implicit conversion in make_pair call Closes: https://bugs.gentoo.org/650416 Package-Manager: Portage-2.3.41, Repoman-2.3.9 sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild | 3 ++- .../cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch | 11 +++++++++++ 2 files changed, 13 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 745baffad99..3892e03e23b 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-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -33,6 +33,7 @@ PATCHES=( "${FILESDIR}"/${P}-boost-1.65-tr1-removal.patch "${FILESDIR}"/${P}-gcc7.patch "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-gcc5-make_shared.patch ) src_prepare() { diff --git a/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch new file mode 100644 index 00000000000..67a28df1024 --- /dev/null +++ b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch @@ -0,0 +1,11 @@ +--- a/src/differential.cpp ++++ b/src/differential.cpp +@@ -575,7 +575,7 @@ + boost::mutex::scoped_lock lock(meta_data_lock); + #endif + pair<SampleDiffMetaDataTable::iterator, bool> p; +- p = meta_data_table.insert(make_pair(description, new SampleDifferenceMetaData())); ++ p = meta_data_table.insert(make_pair(description, boost::make_shared<SampleDifferenceMetaData>())); + return p.first->second; + } +
