From a31b4d70f5628e543d9f75dbf80da09a1a50548b Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Mar 04 2009 16:06:12 +0000
Subject: fix up strchr const rets for const arg


---

diff --git a/lilypond-consts.patch b/lilypond-consts.patch
new file mode 100644
index 0000000..e71e06c
--- /dev/null
+++ b/lilypond-consts.patch
@@ -0,0 +1,21 @@
+diff -ru lilypond-2.12.2.orig/lily/relocate.cc lilypond-2.12.2/lily/relocate.cc
+--- lilypond-2.12.2.orig/lily/relocate.cc	2009-03-04 15:27:38.000000000 +0000
++++ lilypond-2.12.2/lily/relocate.cc	2009-03-04 15:28:14.000000000 +0000
+@@ -276,13 +276,13 @@
+   string out;
+   while (ptr < start_ptr + len)
+     {
+-      char *dollar = strchr (ptr, '$');
++      const char *dollar = strchr (ptr, '$');
+       
+       if (dollar != NULL)
+ 	{
+-	  char *start_var = dollar + 1;
+-	  char *end_var = start_var;
+-	  char *start_next = end_var;
++	  const char *start_var = dollar + 1;
++	  const char *end_var = start_var;
++	  const char *start_next = end_var;
+ 	  
+ 	  out += string (ptr, dollar - ptr);
+ 	  ptr = dollar;
diff --git a/lilypond.spec b/lilypond.spec
index 7854731..6c70072 100644
--- a/lilypond.spec
+++ b/lilypond.spec
@@ -1,6 +1,6 @@
 Name:		lilypond
 Version:	2.12.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
@@ -11,6 +11,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		lilypond-2.11.65-python26.patch
 #Patch1:		lilypond-2.12.0-parse-scm.patch
 Patch2:		lilypond-2.21.2-gcc44-relocate.patch
+Patch3:		lilypond-consts.patch
 
 Requires:	ghostscript >= 8.15
 Requires(post): /sbin/install-info
@@ -149,6 +150,7 @@ This contains the directory common to all lilypond fonts.
 %patch0 -p0
 #%patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 %configure --without-kpathsea --disable-checking \
@@ -239,6 +241,9 @@ fi
 
 
 %changelog
+* Wed Mar 04 2009 Caolán McNamara <caolanm@redhat.com> - 2.12.2-3
+- fix up strchr const rets for const arg
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.12.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild