patch::: 1.4.12.jcn1

1.4.12.jcn1
===========

* Documentation/topdocs/INSTALL.texi: Add section for MacOS X.

* darwin.patch: New file.

1.4.12
======

diff --git a/CHANGES b/CHANGES
index 93fe8e0efd95d5b27db57a95d757b8c754ad9fb1..d4e884ebe3a7823670eba98b848c840c39d70970 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,13 @@
+1.4.12.jcn1
+===========
+
+* Documentation/topdocs/INSTALL.texi: Add section for MacOS X.
+
+* darwin.patch: New file.
+
+1.4.12
+======
+
 1.4.11.uu1
 ==========
 

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 96886c203c37e85561cbf44af603baf65ebe987c..d422f4e41400524c4949338a12cd7320f78856c9 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -480,6 +480,51 @@ interfere with your build, you may want to do this before the build too:
        dpkg --purge lilypond lilypond1.3
 @end example
 
+@subsection MacOS X
+
+LilyPond has been built on Darwin, to be precise, on:
+@example
+    Darwin buoux.aspiratie.nl 5.3 Darwin Kernel Version 5.3: Thu Jan 24
+    22:06:02 PST 2002; root:xnu/xnu-201.19.obj~1/RELEASE_PPC  Power Macintosh powerpc
+@end example
+
+using:   
+
+@example
+    Apple Computer, Inc. version gcc-932.1, based on gcc version 2.95.2 19991024 (release)
+@end example
+
+To make sure you have all packages needed to build LilyPond installed,
+run as root:
+
+@example
+        apt-get install bash python guile debianutils flex bison texinfo \
+                ghostscript6 netpbm m4 gettext
+@end example        
+
+and:
+                
+@example
+        fink install tetex
+@end example        
+
+For more information about @file{apt-get} and @file{fink}, see
+@uref{http://fink.sf.net,fink.sourceforge.net}.
+
+@c  brokenness of autoconf; don't ask
+Then, configure, patch, make and install LilyPond using these commands:
+
+@example
+        CC="cc -I/sw/include" CXX="c++ -I/sw/include" LDFLAGS="-L/sw/lib" \
+            ./configure --prefix=/sw
+        make -C lily out/parser.hh out/parser.cc out/config.h
+        patch -p0 < darwin.patch
+        make -C lily out/parser.o
+        make DEPENDENCIES_OUTPUT=/dev/null all
+        make install
+@end example
+
+For installing, you must be root, of course.
 
 @c Why isn't this in BUGS (where it belongs?)
 @section Problems

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 109a201be41c3ffa6c27abd44f23944c79fe46e2..36f11dfcf5cc42bcd3adcb46a2ce0782502cffc5 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4
 README_FILES =  DEDICATION COPYING NEWS CHANGES ROADMAP
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch lexer-gcc-3.0.patch .cvsignore
+EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch mktexnam.patch lexer-gcc-3.0.patch darwin.patch .cvsignore
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION

diff --git a/VERSION b/VERSION
index cad6ec9f68354eb0f79067ae4750c43e11633478..e0bff46ad9c80eca873d8de91ae05e9161745f5d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=4
 PATCH_LEVEL=12
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/darwin.patch b/darwin.patch
new file mode 100644 (file)
index 0000000..f50c32d
--- /dev/null
+++ b/darwin.patch
@@ -0,0 +1,32 @@
+--- 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 @@
+ 
+     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. */
+ 
+--- 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;