rpms/lilypond/devel lilypond-gcc43.patch, NONE, 1.1 lilypond.spec, 1.23, 1.24

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/lilypond/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18147

Modified Files:
	lilypond.spec 
Added Files:
	lilypond-gcc43.patch 
Log Message:
* Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> - 2.10.33-3
- Fix the build against GCC 4.3; simply missing some #includes


lilypond-gcc43.patch:

--- NEW FILE lilypond-gcc43.patch ---
diff -up lilypond-2.10.33/flower/file-name.cc.gcc43 lilypond-2.10.33/flower/file-name.cc
--- lilypond-2.10.33/flower/file-name.cc.gcc43	2008-04-08 00:13:27.000000000 -0400
+++ lilypond-2.10.33/flower/file-name.cc	2008-04-08 00:13:55.000000000 -0400
@@ -10,8 +10,10 @@
 #include "file-name.hh"
 
 #include <cstdio>
+#include <cstdlib>
 #include <cerrno>
 #include <unistd.h>
+#include <limits.h>
 
 using namespace std;
 
diff -up lilypond-2.10.33/flower/include/rational.hh.gcc43 lilypond-2.10.33/flower/include/rational.hh
--- lilypond-2.10.33/flower/include/rational.hh.gcc43	2008-04-08 00:14:23.000000000 -0400
+++ lilypond-2.10.33/flower/include/rational.hh	2008-04-08 00:15:09.000000000 -0400
@@ -9,6 +9,8 @@
 #ifndef RATIONAL_HH
 #define RATIONAL_HH
 
+#include <climits>
+
 #include "std-string.hh"
 
 #include "std-string.hh"
diff -up lilypond-2.10.33/flower/include/std-vector.hh.gcc43 lilypond-2.10.33/flower/include/std-vector.hh
--- lilypond-2.10.33/flower/include/std-vector.hh.gcc43	2008-04-08 00:11:55.000000000 -0400
+++ lilypond-2.10.33/flower/include/std-vector.hh	2008-04-08 00:12:58.000000000 -0400
@@ -22,6 +22,7 @@
 #include <algorithm>   /* find, reverse, sort */
 #include <functional>  /* unary_function */
 #include <cassert>
+#include <string>
 
 using namespace std;
 
diff -up lilypond-2.10.33/lily/midi-stream.cc.gcc43 lilypond-2.10.33/lily/midi-stream.cc
--- lilypond-2.10.33/lily/midi-stream.cc.gcc43	2008-04-08 00:19:35.000000000 -0400
+++ lilypond-2.10.33/lily/midi-stream.cc	2008-04-08 00:19:44.000000000 -0400
@@ -9,6 +9,7 @@
 #include "midi-stream.hh"
 
 #include <cerrno>
+#include <cstring>
 using namespace std;
 
 #include "international.hh"
diff -up lilypond-2.10.33/lily/piano-pedal-engraver.cc.gcc43 lilypond-2.10.33/lily/piano-pedal-engraver.cc
--- lilypond-2.10.33/lily/piano-pedal-engraver.cc.gcc43	2008-04-08 00:21:48.000000000 -0400
+++ lilypond-2.10.33/lily/piano-pedal-engraver.cc	2008-04-08 00:22:09.000000000 -0400
@@ -10,6 +10,8 @@
   bracketed pedals.
 */
 
+#include <cstring>
+
 #include "engraver.hh"
 
 #include "axis-group-interface.hh"
diff -up lilypond-2.10.33/lily/prob.cc.gcc43 lilypond-2.10.33/lily/prob.cc
--- lilypond-2.10.33/lily/prob.cc.gcc43	2008-04-08 00:22:39.000000000 -0400
+++ lilypond-2.10.33/lily/prob.cc	2008-04-08 00:22:50.000000000 -0400
@@ -6,6 +6,8 @@
   (c) 2004--2007 Jan Nieuwenhuizen <janneke at gnu.org>
 */
 
+#include <cstring>
+
 #include "prob.hh"
 #include "main.hh"
 #include "item.hh"
diff -up lilypond-2.10.33/lily/relocate.cc.gcc43 lilypond-2.10.33/lily/relocate.cc
--- lilypond-2.10.33/lily/relocate.cc.gcc43	2008-04-08 00:23:10.000000000 -0400
+++ lilypond-2.10.33/lily/relocate.cc	2008-04-08 00:23:23.000000000 -0400
@@ -16,6 +16,7 @@
 
 #include <sys/types.h>
 #include <dirent.h>
+#include <cstring>
 
 #if HAVE_GETTEXT
 #include <libintl.h>
diff -up lilypond-2.10.33/lily/source-file.cc.gcc43 lilypond-2.10.33/lily/source-file.cc
--- lilypond-2.10.33/lily/source-file.cc.gcc43	2008-04-08 00:24:09.000000000 -0400
+++ lilypond-2.10.33/lily/source-file.cc	2008-04-08 00:24:48.000000000 -0400
@@ -18,6 +18,7 @@
 #endif
 
 #include <cstdio>
+#include <cstring>
 
 #if HAVE_SSTREAM
 #include <sstream>
diff -up lilypond-2.10.33/lily/translator.cc.gcc43 lilypond-2.10.33/lily/translator.cc
--- lilypond-2.10.33/lily/translator.cc.gcc43	2008-04-08 00:25:53.000000000 -0400
+++ lilypond-2.10.33/lily/translator.cc	2008-04-08 00:26:05.000000000 -0400
@@ -6,6 +6,8 @@
   (c) 1997--2007 Han-Wen Nienhuys <hanwen at xs4all.nl>
 */
 
+#include <cstring>
+
 #include "translator.hh"
 
 #include "context-def.hh"


Index: lilypond.spec
===================================================================
RCS file: /cvs/extras/rpms/lilypond/devel/lilypond.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- lilypond.spec	19 Feb 2008 20:26:37 -0000	1.23
+++ lilypond.spec	8 Apr 2008 04:32:53 -0000	1.24
@@ -1,12 +1,13 @@
 Name:		lilypond
 Version:	2.10.33
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A typesetting system for music notation
 
 Group:		Applications/Publishing
 License:	GPLv2
 URL:		http://www.lilypond.org
 Source0:	http://download.linuxaudio.org/lilypond/sources/v2.10/%{name}-%{version}.tar.gz
+Patch1:         %{name}-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       ghostscript >= 8.15
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -92,6 +94,9 @@
 
 
 %changelog
+* Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> - 2.10.33-3
+- Fix the build against GCC 4.3; simply missing some #includes
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.10.33-2
 - Autorebuild for GCC 4.3