packages: lilypond/lilypond.spec, lilypond/lilypond-aclocal.patch (NEW), li...

[jajcus]

Author: jajcus                       Date: Sat Nov 28 12:27:30 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build fixes
- s/tetex/texlive/ in the dependencies

---- Files affected:
packages/lilypond:
   lilypond.spec (1.56 -> 1.57) , lilypond-aclocal.patch (NONE -> 1.1)  (NEW), lilypond-bad_cast.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lilypond/lilypond.spec
diff -u packages/lilypond/lilypond.spec:1.56 packages/lilypond/lilypond.spec:1.57
--- packages/lilypond/lilypond.spec:1.56	Sun Jun 21 13:37:36 2009
+++ packages/lilypond/lilypond.spec	Sat Nov 28 13:27:24 2009
@@ -18,6 +18,8 @@
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-sh.patch
 Patch3:		%{name}-afm.patch
+Patch4:		%{name}-aclocal.patch
+Patch5:		%{name}-bad_cast.patch
 URL:		http://www.lilypond.org/
 %{?with_docs:BuildRequires:	ImageMagick}
 %{?with_docs:BuildRequires:	ImageMagick-coder-png}
@@ -44,19 +46,19 @@
 BuildRequires:	pkgconfig >= 1:0.9.0
 BuildRequires:	python-devel >= 2.4
 %{?with_docs:BuildRequires:	rsync}
-BuildRequires:	tetex-dvips
-BuildRequires:	tetex-fonts-cm
-BuildRequires:	tetex-fonts-cmextra
-BuildRequires:	tetex-fonts-jknappen
-%{?with_docs:BuildRequires:	tetex-latex-bibtex}
-BuildRequires:	tetex-metapost
+BuildRequires:	texlive-dvips
+BuildRequires:	texlive-fonts-cm
+BuildRequires:	texlive-fonts-cmextra
+BuildRequires:	texlive-fonts-jknappen
+%{?with_docs:BuildRequires:	texlive-latex-bibtex}
+BuildRequires:	texlive-metapost
 BuildRequires:	texinfo >= 4.11
 %{?with_docs:BuildRequires:	texinfo-texi2dvi}
 BuildConflicts:	lilypond < 1.6.0
 Requires:	ghostscript >= 8.15
 Requires:	guile >= 5:1.8.2
 Requires:	python >= 2.4
-Requires:	tetex-format-latex >= 1.0
+Requires:	texlive-latex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		texmfdir	%{_datadir}/texmf
@@ -107,6 +109,8 @@
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.* stepmake/bin
@@ -227,6 +231,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2009/11/28 12:27:24  jajcus
+- build fixes
+- s/tetex/texlive/ in the dependencies
+
 Revision 1.56  2009/06/21 11:37:36  gotar
 - allow upgrade from broken %{texmfdir}/dvips/lilypond/ps symlink
 

================================================================
Index: packages/lilypond/lilypond-aclocal.patch
diff -u /dev/null packages/lilypond/lilypond-aclocal.patch:1.1
--- /dev/null	Sat Nov 28 13:27:30 2009
+++ packages/lilypond/lilypond-aclocal.patch	Sat Nov 28 13:27:24 2009
@@ -0,0 +1,12 @@
+diff -dur lilypond-2.12.2.orig/aclocal.m4 lilypond-2.12.2/aclocal.m4
+--- lilypond-2.12.2.orig/aclocal.m4	2009-11-28 12:18:30.000000000 +0100
++++ lilypond-2.12.2/aclocal.m4	2009-11-28 12:19:27.000000000 +0100
+@@ -165,6 +165,8 @@
+ 
+ 
+ AC_DEFUN(STEPMAKE_COMPILE, [
++
++    AC_REQUIRE([AC_PROG_CC])
+     # -O is necessary to get inlining
+     CFLAGS=${CFLAGS-""}
+     CXXFLAGS=${CXXFLAGS-$CFLAGS}

================================================================
Index: packages/lilypond/lilypond-bad_cast.patch
diff -u /dev/null packages/lilypond/lilypond-bad_cast.patch:1.1
--- /dev/null	Sat Nov 28 13:27:30 2009
+++ packages/lilypond/lilypond-bad_cast.patch	Sat Nov 28 13:27:24 2009
@@ -0,0 +1,20 @@
+--- lilypond-2.12.2.orig/lily/relocate.cc	2009-01-19 01:04:57.000000000 +0100
++++ lilypond-2.12.2/lily/relocate.cc	2009-11-28 12:30:01.000000000 +0100
+@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lilypond/lilypond.spec?r1=1.56&r2=1.57&f=u