From da4f90b4f1a99ee4770cd864bd00cd323668152a Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Fri, 23 Dec 2005 01:38:26 +0000
Subject: [PATCH] Required patch for OSX.

---
 ChangeLog    |  3 +++
 darwin.patch | 39 +++++++++------------------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 53b079f909..927f44b64c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* scm/define-markup-commands.scm: typo.  @code{\raise}
 	=> @code{\\raise}.
 
+	* darwin.patch: now used again, includes a
+	required patch from fink.
+
 2005-12-21  Heikki Junes  <hjunes@cc.hut.fi>
 
 	* po/TODO: mention gtranslator along with kbabel.
diff --git a/darwin.patch b/darwin.patch
index f50c32de44..1b5a83fce8 100644
--- a/darwin.patch
+++ b/darwin.patch
@@ -1,32 +1,11 @@
---- lily/out/parser.hh.orig	Tue Mar 12 16:10:02 2002
-+++ lily/out/parser.hh	Tue Mar 12 16:23:58 2002
-@@ -14,7 +14,7 @@
+diff -ruN stepmake/stepmake/c++-rules.make lilypond-2.7.11/stepmake/stepmake/c++-rules.make
+--- stepmake/stepmake/c++-rules.make	2005-10-02 09:14:45.000000000 -0700
++++ stepmake/stepmake/c++-rules.make	2005-10-02 09:15:10.000000000 -0700
+@@ -26,6 +26,7 @@
  
-     Request * request;
+ $(outdir)/%.cc: %.ll
+ 	$(FLEX) -Cfe -p -p -o$@ $< 
++	perl -i.bak -pe 's/^class istream;/#include <iostream>;\nusing namespace std;/' $@
  
--    //* We use SCMs to do strings, because it saves us the trouble of
-+    /* We use SCMs to do strings, because it saves us the trouble of
- deleting them.  Let's hope that a stack overflow doesnt trigger a move
- of the parse stack onto the heap. */
- 
---- lily/out/parser.cc.orig	Tue Mar 12 16:08:40 2002
-+++ lily/out/parser.cc	Tue Mar 12 16:16:02 2002
-@@ -227,7 +227,7 @@
- 
- 
- // needed for bison.simple's malloc () and free ()
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #ifndef NDEBUG
- #define YYDEBUG 1
-@@ -258,7 +258,7 @@
- 
-     Request * request;
- 
--    //* We use SCMs to do strings, because it saves us the trouble of
-+    /* We use SCMs to do strings, because it saves us the trouble of
- deleting them.  Let's hope that a stack overflow doesnt trigger a move
- of the parse stack onto the heap. */
- 
-     SCM scm;
+ $(outdir)/%-rc.o: $(outdir)/%.rc
+ 	$(WINDRES) $(WINDRES_FLAGS) -o$@ $<
-- 
2.39.5