The following patch fixes an issue which keeps lilypond from building
properly on GCC 4.7. [It's also almost certainly a bug in addition to
this.]
---
debian/changelog | 7 +++++++
lily/music-sequence.cc | 8 ++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a4bbb2f..f2cb168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lilypond (2.14.2-3) unstable; urgency=low
+
+ * Fix redefinition of s in Music_sequence::first_start. (Closes
+ #672087).
+
+ -- Don Armstrong <d...@debian.org> Sun, 13 May 2012 16:07:16 -0700
+
lilypond (2.14.2-2) unstable; urgency=low
* Disable optimization on i386 and kfreebsd-i386 to avoid segfaults with
diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 8c9642c..42bfd87 100644
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -148,10 +148,10 @@ Music_sequence::first_start (SCM l)
for (SCM s = l; scm_is_pair (s); s = scm_cdr (s))
{
Music *mus = unsmob_music (scm_car (s));
- Moment l = mus->get_length ();
- Moment s = mus->start_mom ();
- if (l.to_bool () || s.to_bool ())
- return s;
+ Moment lt = mus->get_length ();
+ Moment st = mus->start_mom ();
+ if (lt.to_bool () || st.to_bool ())
+ return st;
}
return m;
}
--
listen, what you do in the privacy
of your neighbour's house while they're away
is your own business
-- a softer world #511
http://www.asofterworld.com/index.php?id=511
http://www.donarmstrong.com http://rzlab.ucr.edu
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
