| 1 |
commit: e035eabc7b791b9854e53cf596b65e8330ef6e83 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 30 14:58:58 2018 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 30 14:59:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e035eabc |
| 7 |
|
| 8 |
sci-biology/cufflinks: Fix implicit conversion in make_pair call |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/650416 |
| 11 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 12 |
|
| 13 |
sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild | 3 ++- |
| 14 |
.../cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch | 11 +++++++++++ |
| 15 |
2 files changed, 13 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild b/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild |
| 18 |
index 745baffad99..3892e03e23b 100644 |
| 19 |
--- a/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild |
| 20 |
+++ b/sci-biology/cufflinks/cufflinks-2.2.1-r2.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -33,6 +33,7 @@ PATCHES=( |
| 28 |
"${FILESDIR}"/${P}-boost-1.65-tr1-removal.patch |
| 29 |
"${FILESDIR}"/${P}-gcc7.patch |
| 30 |
"${FILESDIR}"/${P}-format-security.patch |
| 31 |
+ "${FILESDIR}"/${P}-gcc5-make_shared.patch |
| 32 |
) |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
|
| 36 |
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 |
| 37 |
new file mode 100644 |
| 38 |
index 00000000000..67a28df1024 |
| 39 |
--- /dev/null |
| 40 |
+++ b/sci-biology/cufflinks/files/cufflinks-2.2.1-gcc5-make_shared.patch |
| 41 |
@@ -0,0 +1,11 @@ |
| 42 |
+--- a/src/differential.cpp |
| 43 |
++++ b/src/differential.cpp |
| 44 |
+@@ -575,7 +575,7 @@ |
| 45 |
+ boost::mutex::scoped_lock lock(meta_data_lock); |
| 46 |
+ #endif |
| 47 |
+ pair<SampleDiffMetaDataTable::iterator, bool> p; |
| 48 |
+- p = meta_data_table.insert(make_pair(description, new SampleDifferenceMetaData())); |
| 49 |
++ p = meta_data_table.insert(make_pair(description, boost::make_shared<SampleDifferenceMetaData>())); |
| 50 |
+ return p.first->second; |
| 51 |
+ } |
| 52 |
+ |
Archives