Bug#667290: fix ftbfs with GCC 4.7

[Matthias Klose]

tags 667290 + patch
thanks

-------------- next part --------------
diff -Nru muse-2.0~rc2/debian/changelog muse-2.0~rc2/debian/changelog
--- muse-2.0~rc2/debian/changelog	2012-01-09 12:49:16.000000000 +0000
+++ muse-2.0~rc2/debian/changelog	2012-04-17 12:32:38.000000000 +0000
@@ -1,3 +1,10 @@
+muse (2.0~rc2-1.1) unstable; urgency=low
+
+  * Non maintainer upload.
+  * Fix build failure with GCC 4.7. Closes: #667290.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 17 Apr 2012 14:32:01 +0200
+
 muse (2.0~rc2-1) unstable; urgency=low
 
   * New upstream RC.
diff -Nru muse-2.0~rc2/debian/patches/fix-ftbfs-gcc4.7.diff muse-2.0~rc2/debian/patches/fix-ftbfs-gcc4.7.diff
--- muse-2.0~rc2/debian/patches/fix-ftbfs-gcc4.7.diff	1970-01-01 00:00:00.000000000 +0000
+++ muse-2.0~rc2/debian/patches/fix-ftbfs-gcc4.7.diff	2012-04-17 12:31:51.000000000 +0000
@@ -0,0 +1,20 @@
+Index: muse-2.0~rc2/muse/liste/editevent.cpp
+===================================================================
+--- muse-2.0~rc2.orig/muse/liste/editevent.cpp	2012-01-06 19:45:38.000000000 +0000
++++ muse-2.0~rc2/muse/liste/editevent.cpp	2012-04-17 12:31:48.795371787 +0000
+@@ -642,6 +642,7 @@
+                         continue;
+                   }
+             MusECore::MidiController* c = port->midiController(num);
++	    {
+             isList i = sList.begin();
+             for (; i != sList.end(); ++i) {
+                   if (*i == c->name())
+@@ -649,6 +650,7 @@
+                   }
+             if (i == sList.end())
+                   sList.push_back(c->name());
++	    }
+             }
+       MusECore::MidiController* mc = port->midiController(num);
+       int idx = 0;
diff -Nru muse-2.0~rc2/debian/patches/series muse-2.0~rc2/debian/patches/series
--- muse-2.0~rc2/debian/patches/series	2012-01-09 12:47:03.000000000 +0000
+++ muse-2.0~rc2/debian/patches/series	2012-04-17 12:29:15.000000000 +0000
@@ -1,2 +1,3 @@
 0002-gcc_hardening.patch
 1001-buildsystem.patch
+fix-ftbfs-gcc4.7.diff