[SCM] muse/master: Fix build failure with GCC 4.6.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit da4334d52d6070a6cd56d95edea7755f417cbbc3
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 17 17:51:02 2012 +0200

    Fix build failure with GCC 4.6.
    
    Thanks: Matthias Klose
    Closes: #667290

diff --git a/debian/patches/0003-ftbfs_gcc47.patch b/debian/patches/0003-ftbfs_gcc47.patch
new file mode 100644
index 0000000..fb1ddcd
--- /dev/null
+++ b/debian/patches/0003-ftbfs_gcc47.patch
@@ -0,0 +1,26 @@
+Author: Matthias Klose <doko at debian.org>
+Description: Fix build failure with GCC 4.6
+Bug-Debian: http://bugs.debian.org/667290
+Forwarded: no
+---
+ muse/liste/editevent.cpp |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- muse.orig/muse/liste/editevent.cpp
++++ muse/muse/liste/editevent.cpp
+@@ -642,6 +642,7 @@ EditCtrlDialog::EditCtrlDialog(int tick,
+                         continue;
+                   }
+             MusECore::MidiController* c = port->midiController(num);
++	    {
+             isList i = sList.begin();
+             for (; i != sList.end(); ++i) {
+                   if (*i == c->name())
+@@ -649,6 +650,7 @@ EditCtrlDialog::EditCtrlDialog(int tick,
+                   }
+             if (i == sList.end())
+                   sList.push_back(c->name());
++	    }
+             }
+       MusECore::MidiController* mc = port->midiController(num);
+       int idx = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 2ba8d8e..a9804ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-gcc_hardening.patch
+0003-ftbfs_gcc47.patch
 1001-buildsystem.patch

-- 
muse packaging