summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2018-06-30 16:58:58 +0200
committerDavid Seifert <soap@gentoo.org>2018-06-30 16:59:32 +0200
commite035eabc7b791b9854e53cf596b65e8330ef6e83 (patch)
tree3c7871f6e291ebd9560b850914cd6712b5d010bc /sci-biology
parentdev-python/sqlalchemy: stable 1.2.7 for ia64, bug #659666 (diff)
downloadgentoo-e035eabc7b791b9854e53cf596b65e8330ef6e83.tar.gz
gentoo-e035eabc7b791b9854e53cf596b65e8330ef6e83.tar.bz2
gentoo-e035eabc7b791b9854e53cf596b65e8330ef6e83.zip
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
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild3
-rw-r--r--sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch11
2 files changed, 13 insertions, 1 deletions
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;
+ }
+