Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sci-libs/libmems: Version bump, fix bug 529770 and QA issues. #524

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions sci-libs/libmems/files/libmems-1.6_p1-broken-constness.patch
@@ -0,0 +1,24 @@
Fix bug 529770 caused by non-const copy constructor.

--- libmems-1.6_p1/libMems/Aligner.cpp
+++ libmems-1.6_p1/libMems/Aligner.cpp
@@ -939,7 +939,7 @@
MatchLeftEndComparator( unsigned seq = 0 ){
m_seq = seq;
}
- MatchLeftEndComparator( MatchLeftEndComparator& msc ){
+ MatchLeftEndComparator( const MatchLeftEndComparator& msc ){
m_seq = msc.m_seq;
}
// TODO?? make this do a wraparound comparison if all is equal?
--- libmems-1.6_p1/libMems/Aligner.h
+++ libmems-1.6_p1/libMems/Aligner.h
@@ -49,7 +49,7 @@
LabeledMemComparator( uint seq ){
m_seq = seq;
}
- LabeledMemComparator( LabeledMemComparator& lmc ){
+ LabeledMemComparator( const LabeledMemComparator& lmc ){
m_seq = lmc.m_seq;
}
boolean operator()(const LabeledMem& a, const LabeledMem& b) const{
10 changes: 10 additions & 0 deletions sci-libs/libmems/files/libmems-1.6_p1-build.patch
Expand Up @@ -17,3 +17,13 @@ index 6101f71..d66053d 100644

LIBMEMS_H = \
RepeatHash.h MatchHashEntry.h \
--- a/libMems/dmSML/util.c
+++ b/libMems/dmSML/util.c
@@ -2,6 +2,7 @@
#include "config.h"
#endif

+#include <stdlib.h>
#include <stdio.h>
#include "libMems/dmSML/util.h"

36 changes: 36 additions & 0 deletions sci-libs/libmems/libmems-1.6_p1-r1.ebuild
@@ -0,0 +1,36 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$

EAPI=6

inherit autotools

DESCRIPTION="Library for sci-biology/mauve"
HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"

SLOT="0"
LICENSE="GPL-2"
IUSE="doc"
KEYWORDS="~amd64 ~x86"

CDEPEND="
dev-libs/boost
sci-libs/libgenome
sci-libs/libmuscle"
DEPEND="${CDEPEND}
doc? ( app-doc/doxygen )"
RDEPEND="${CDEPEND}"

PATCHES=(
"${FILESDIR}"/${P}-build.patch
"${FILESDIR}"/${P}-boost.patch
"${FILESDIR}"/${P}-gcc-4.7.patch
"${FILESDIR}"/${P}-broken-constness.patch
)

src_prepare() {
default
eautoreconf
}