Apply some upstream patches to fix build with Clang.

6 files changed, 95 insertions, 1 deletions

diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 57277699acf..0fd47472084 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2013/01/25 11:32:07 wiz Exp $
+$NetBSD: distinfo,v 1.17 2013/04/01 12:20:46 joerg Exp $
 
 SHA1 (lilypond-2.16.2.tar.gz) = 1eb3b0e5c117a8669dba19ab28f933351e51e39a
 RMD160 (lilypond-2.16.2.tar.gz) = bbb68ef05e81d8d9f5cf7ac26cffb5ab3935c61a
@@ -7,4 +7,9 @@ SHA1 (patch-aa) = 99dc3ecc7df664fba71d850e6c0b253fc451ec61
 SHA1 (patch-ab) = 08bf158aed8f6cbaf11d054716069486cf393d6b
 SHA1 (patch-ac) = ca7a8671885a40201f201431d2eb8a3377993c67
 SHA1 (patch-configure) = b0c73d828f26fb8db895ace55a678a6d7b09db0e
+SHA1 (patch-lily_GNUmakefile) = b5ee1b8a307b8d1118e603a995d7645536c71dc4
+SHA1 (patch-lily_grob.cc) = d6f12a99f3a517fb635e64d564821873f7f6b78f
+SHA1 (patch-lily_include_lily-proto.hh) = a472898ad4c3adb8b31aec8009f1d04845b9ddb3
+SHA1 (patch-lily_include_translator-group.hh) = c2fb449562288ecf097fefae7527c5f89f1f527c
+SHA1 (patch-lily_translator-dispatch-list.cc) = 90bc3d7fa45a10d2f5b92557328e82aa3e9763d8
 SHA1 (patch-scripts_auxiliar_cg-section.sh) = c6838a358ae1ea2f8ddd0791e72eb3c25ac2019b
diff --git a/print/lilypond/patches/patch-lily_GNUmakefile b/print/lilypond/patches/patch-lily_GNUmakefile
new file mode 100644
index 00000000000..f994d9cedb9
--- /dev/null
+++ b/print/lilypond/patches/patch-lily_GNUmakefile
@@ -0,0 +1,17 @@
+$NetBSD: patch-lily_GNUmakefile,v 1.1 2013/04/01 12:20:47 joerg Exp $
+
+Issue 2208.
+
+--- lily/GNUmakefile.orig	2013-03-31 15:01:52.000000000 +0000
++++ lily/GNUmakefile
+@@ -7,10 +7,6 @@ SUBDIRS = include
+ MODULE_LIBS=$(depth)/flower
+ MODULE_INCLUDES= $(depth)/flower/include
+ 
+-# need this to convert between function pointers and member function pointers.
+-MODULE_CXXFLAGS= -Wno-pmf-conversions 
+-
+-
+ HELP2MAN_EXECS = lilypond
+ STEPMAKE_TEMPLATES=c c++ executable po help2man
+ 
diff --git a/print/lilypond/patches/patch-lily_grob.cc b/print/lilypond/patches/patch-lily_grob.cc
new file mode 100644
index 00000000000..450cdc6273c
--- /dev/null
+++ b/print/lilypond/patches/patch-lily_grob.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-lily_grob.cc,v 1.1 2013/04/01 12:20:47 joerg Exp $
+
+Issue 3201.
+
+--- lily/grob.cc.orig	2013-03-31 15:06:04.000000000 +0000
++++ lily/grob.cc
+@@ -82,13 +82,16 @@ Grob::Grob (SCM basicprops)
+ }
+ 
+ Grob::Grob (Grob const &s)
+-  : dim_cache_ (s.dim_cache_)
+ {
+   original_ = (Grob *) & s;
+   self_scm_ = SCM_EOL;
+ 
+   immutable_property_alist_ = s.immutable_property_alist_;
+   mutable_property_alist_ = SCM_EOL;
++
++  for (Axis a = X_AXIS; a < NO_AXES; incr (a))
++    dim_cache_ [a] = s.dim_cache_ [a];
++
+   interfaces_ = s.interfaces_;
+   object_alist_ = SCM_EOL;
+ 
diff --git a/print/lilypond/patches/patch-lily_include_lily-proto.hh b/print/lilypond/patches/patch-lily_include_lily-proto.hh
new file mode 100644
index 00000000000..56acfdc29b9
--- /dev/null
+++ b/print/lilypond/patches/patch-lily_include_lily-proto.hh
@@ -0,0 +1,18 @@
+$NetBSD: patch-lily_include_lily-proto.hh,v 1.1 2013/04/01 12:20:47 joerg Exp $
+
+Issue 2208.
+
+--- lily/include/lily-proto.hh.orig	2013-03-31 14:59:54.000000000 +0000
++++ lily/include/lily-proto.hh
+@@ -198,9 +198,6 @@ class Translator_change;
+ class Translator_group;
+ class Transposed_music;
+ class yyFlexLexer;
+-
+-typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *,
+-                                                           Grob_info);
+-typedef void (*Translator_void_method_ptr) (Translator *);
+-
++typedef void (Engraver::*Engraver_void_function_engraver_grob_info) (Grob_info);
++typedef void (Translator::*Translator_void_method_ptr) ();
+ #endif /* LILY_PROTO_HH */
diff --git a/print/lilypond/patches/patch-lily_include_translator-group.hh b/print/lilypond/patches/patch-lily_include_translator-group.hh
new file mode 100644
index 00000000000..5778190956e
--- /dev/null
+++ b/print/lilypond/patches/patch-lily_include_translator-group.hh
@@ -0,0 +1,15 @@
+$NetBSD: patch-lily_include_translator-group.hh,v 1.1 2013/04/01 12:20:47 joerg Exp $
+
+Issue 2208.
+
+--- lily/include/translator-group.hh.orig	2013-03-31 15:00:25.000000000 +0000
++++ lily/include/translator-group.hh
+@@ -43,7 +43,7 @@ struct Translator_method_binding
+   void invoke ()
+   {
+     if (method_)
+-      (*method_) (translator_);
++      (translator_->*method_)();
+   }
+ };
+ 
diff --git a/print/lilypond/patches/patch-lily_translator-dispatch-list.cc b/print/lilypond/patches/patch-lily_translator-dispatch-list.cc
new file mode 100644
index 00000000000..46b2c42e14d
--- /dev/null
+++ b/print/lilypond/patches/patch-lily_translator-dispatch-list.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-lily_translator-dispatch-list.cc,v 1.1 2013/04/01 12:20:47 joerg Exp $
+
+Issue 2208.
+
+--- lily/translator-dispatch-list.cc.orig	2013-03-31 15:00:57.000000000 +0000
++++ lily/translator-dispatch-list.cc
+@@ -32,7 +32,7 @@ Engraver_dispatch_list::apply (Grob_info
+       if (e.engraver_ == origin)
+         continue;
+ 
+-      (*e.function_) (e.engraver_, gi);
++      (e.engraver_->*e.function_)(gi);
+     }
+ }
+