rpms/lilypond/devel lilypond-consts.patch, NONE, 1.1 lilypond.spec, 1.42, 1.43

Caolan McNamara caolanm at fedoraproject.org
Wed Mar 4 16:06:42 UTC 2009


Author: caolanm

Update of /cvs/pkgs/rpms/lilypond/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10351

Modified Files:
	lilypond.spec 
Added Files:
	lilypond-consts.patch 
Log Message:
fix up strchr const rets for const arg

lilypond-consts.patch:

--- NEW FILE lilypond-consts.patch ---
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;


Index: lilypond.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- lilypond.spec	25 Feb 2009 20:22:02 -0000	1.42
+++ lilypond.spec	4 Mar 2009 16:06:12 -0000	1.43
@@ -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 @@
 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 @@
 %patch0 -p0
 #%patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 %build
 %configure --without-kpathsea --disable-checking \
@@ -239,6 +241,9 @@
 
 
 %changelog
+* Wed Mar 04 2009 Caolán McNamara <caolanm at redhat.com> - 2.12.2-3
+- fix up strchr const rets for const arg
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list