From: Han-Wen Nienhuys Date: Sat, 14 Oct 2006 19:10:22 +0000 (+0000) Subject: (PATCH_FILES): remove darwin.patch. X-Git-Tag: release/2.10.0-2~173 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8b99bc08541fccf1c7c6c6326a86d1251bd83910;hp=7821c390d25706041f82371e774e00a6b197e08b;p=lilypond.git (PATCH_FILES): remove darwin.patch. --- diff --git a/ChangeLog b/ChangeLog index 2a9f2622fe..4459c006c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-10-14 Han-Wen Nienhuys + * GNUmakefile.in (PATCH_FILES): remove darwin.patch. + * lily/pango-font.cc (pango_item_string_stencil): more verbose message. 2006-10-13 Erlend Aasland diff --git a/GNUmakefile.in b/GNUmakefile.in index 82294790c8..c0177ffa33 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -22,7 +22,7 @@ TOPDOC_FILES=AUTHORS README INSTALL NEWS TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES))) IN_FILES := $(call src-wildcard,*.in) -PATCH_FILES = emacsclient.patch server.el.patch darwin.patch +PATCH_FILES = emacsclient.patch server.el.patch EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \ $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) diff --git a/THANKS b/THANKS index f7b33a3ba1..1539636c6a 100644 --- a/THANKS +++ b/THANKS @@ -31,12 +31,12 @@ Jamie Bullock Kieren MacMillan Michael Meixner Paul Scott +Rick Hansen Steve Doonan Trent Johnston Trevor Bača Vivian Barty-Taylor - DOCUMENTATION HELPERS Cameron Horsburgh diff --git a/darwin.patch b/darwin.patch deleted file mode 100644 index fa6942357a..0000000000 --- a/darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 -@@ -17,6 +17,7 @@ - - $(outdir)/%.cc: %.ll - $(FLEX) -Cfe -p -p -o$@ $< -+ perl -i.bak -pe 's/^class istream;/#include ;\nusing namespace std;/' $@ - - $(outdir)/%-rc.o: $(outdir)/%.rc - $(WINDRES) $(WINDRES_FLAGS) -o$@ $< diff --git a/scm/lily-library.scm b/scm/lily-library.scm index ceb057e47d..54db6ccbe2 100644 --- a/scm/lily-library.scm +++ b/scm/lily-library.scm @@ -231,7 +231,7 @@ found." ;; list -(define (list-join lst intermediate) +(define-public (list-join lst intermediate) "put INTERMEDIATE between all elts of LST." (reduce (lambda (elt prev)