diff options
| author | marino <marino@pkgsrc.org> | 2012-12-15 10:01:20 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-12-15 10:01:20 +0000 |
| commit | cba0cdaca6287a247fcbcdbeeaefade1bb52df06 (patch) | |
| tree | b8ce8289b1acf584005a1aa3fef7d3c5597c9db4 /print | |
| parent | 5b5c4e54e75f5a090fc41dcaba6143d2ec88eac1 (diff) | |
| download | pkgsrc-cba0cdaca6287a247fcbcdbeeaefade1bb52df06.tar.gz | |
print/lilypond: Fix redefinition of Moment S
This problem, detected by gcc 4.6+, was fixed upstream a year ago.
Bring that patch in to fix the build.
Diffstat (limited to 'print')
| -rw-r--r-- | print/lilypond/Makefile | 4 | ||||
| -rw-r--r-- | print/lilypond/distinfo | 3 | ||||
| -rw-r--r-- | print/lilypond/patches/patch-lily_music-sequence.cc | 29 |
3 files changed, 33 insertions, 3 deletions
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 64949346aad..5e0751a53b1 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.85 2012/10/08 23:02:21 adam Exp $ +# $NetBSD: Makefile,v 1.86 2012/12/15 10:01:20 marino Exp $ # DISTNAME= lilypond-2.14.2 -PKGREVISION= 10 +PKGREVISION= 11 CATEGORIES= print MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v2.14/ diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo index a1252238432..0c68a1e7867 100644 --- a/print/lilypond/distinfo +++ b/print/lilypond/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2011/07/31 09:12:46 ryoon Exp $ +$NetBSD: distinfo,v 1.14 2012/12/15 10:01:20 marino Exp $ SHA1 (lilypond-2.14.2.tar.gz) = 0ea657bb184d9d6a2e3f6bca91e6b0d62a3a013e RMD160 (lilypond-2.14.2.tar.gz) = 74123b2db40519feaf8144fd19becf3ad81738e7 @@ -6,3 +6,4 @@ Size (lilypond-2.14.2.tar.gz) = 15224418 bytes SHA1 (patch-aa) = 50b9029a067b3f324da497465c7b2e6a2384f3f0 SHA1 (patch-ab) = 5f210ada53a5062da1173c257095ebddf407d67d SHA1 (patch-ac) = d9565da9b315f2867882052d57394132d7e824a4 +SHA1 (patch-lily_music-sequence.cc) = 8f8c8ce78ae5a420065f7d084a9bcecfc707f322 diff --git a/print/lilypond/patches/patch-lily_music-sequence.cc b/print/lilypond/patches/patch-lily_music-sequence.cc new file mode 100644 index 00000000000..5d7a406a70c --- /dev/null +++ b/print/lilypond/patches/patch-lily_music-sequence.cc @@ -0,0 +1,29 @@ +$NetBSD: patch-lily_music-sequence.cc,v 1.1 2012/12/15 10:01:20 marino Exp $ + +Broken on gcc4.6+, patch taken from upstream (2011-12-09): + Fix issue 2089: dangerous redefinition of SCM s / Moment s + +--- lily/music-sequence.cc.orig 2011-07-25 22:42:15.000000000 +0000 ++++ lily/music-sequence.cc +@@ -143,17 +143,15 @@ Music_sequence::minimum_start (SCM l) + Moment + Music_sequence::first_start (SCM l) + { +- Moment m; + + 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 start = mus->start_mom (); ++ if (mus->get_length ().to_bool() || start.to_bool()) ++ return start; + } +- return m; ++ return Moment (); + } + + MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); |