[med-svn] [libmems] 01/01: Add patches provided by Andrei Zavada <johnhommer at gmail.com> - thanks Andrei for this help

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository libmems.

commit ee57fa8ef4cb534184504c833e764b42f1974739
Author: Andreas Tille <tille at debian.org>
Date:   Sun Apr 19 08:05:50 2015 +0200

    Add patches provided by  Andrei Zavada <johnhommer at gmail.com> - thanks Andrei for this help
---
 debian/patches/01_fix_ctors.patch     | 26 ++++++++++++++++++++++++++
 debian/patches/02_fix_a_Wformat.patch | 19 +++++++++++++++++++
 debian/patches/series                 |  2 ++
 3 files changed, 47 insertions(+)

diff --git a/debian/patches/01_fix_ctors.patch b/debian/patches/01_fix_ctors.patch
new file mode 100644
index 0000000..e4d4798
--- /dev/null
+++ b/debian/patches/01_fix_ctors.patch
@@ -0,0 +1,26 @@
+Author: Andrei Zavada <johnhommer at gmail.com>
+Last-Update: Sat, 18 Apr 2015 23:27:38 +0300
+Description: fix ctors of {MatchLeftEnd,LabeledMem}Comparator to enable sort/3 with g++-4.9
+
+--- a/libMems/Aligner.cpp
++++ b/libMems/Aligner.cpp
+@@ -939,7 +939,7 @@ public:
+ 	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?
+--- a/libMems/Aligner.h
++++ b/libMems/Aligner.h
+@@ -49,7 +49,7 @@ public:
+ 	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{
diff --git a/debian/patches/02_fix_a_Wformat.patch b/debian/patches/02_fix_a_Wformat.patch
new file mode 100644
index 0000000..b9eeff1
--- /dev/null
+++ b/debian/patches/02_fix_a_Wformat.patch
@@ -0,0 +1,19 @@
+Author: Andrei Zavada <johnhommer at gmail.com>
+Last-Update: Sat, 18 Apr 2015 23:27:39 +0300
+Description: fix a -Wformat (boy, that's a bloody serious error)
+
+---
+ libMems/dmSML/dmsort.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libMems/dmSML/dmsort.c
++++ b/libMems/dmSML/dmsort.c
+@@ -825,7 +825,7 @@ int InitdmSML( long working_mb, long buf
+ 		if ( fgets(buf, sizeof(buf), fp) )
+ 		{
+ 			sscanf(buf, "MemTotal: %ld kB", &memTotal);
+-			fprintf( stderr, buf );
++			fprintf( stderr, "%s", buf );
+ 		}
+ 		fclose(fp);
+ 		// allocate about 6/10 of physical memory
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4bf897d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_fix_ctors.patch
+02_fix_a_Wformat.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libmems.git