Re: [Gnu-music-discuss] Re: LilyPond 1.3.85

[Jan Nieuwenhuizen]

On Monday, 11 September 2000, =?iso-8859-1?Q?Martin_Udd=E9n?= writes:

Apply this patch.

Jan.

Generated by address@hidden,
>From = lilypond-1.3.85, To = lilypond-1.3.85.jcn1

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.85.jcn1.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -urN ../lilypond-1.3.85/VERSION ./VERSION
--- ../lilypond-1.3.85/VERSION  Fri Sep  8 15:03:53 2000
+++ ./VERSION   Fri Sep  8 19:41:17 2000
@@ -2,7 +2,7 @@
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=85
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -urN ../lilypond-1.3.85/lily/translator-group.cc ./lily/translator-group.cc
--- ../lilypond-1.3.85/lily/translator-group.cc Fri Sep  8 01:35:35 2000
+++ ./lily/translator-group.cc  Fri Sep  8 19:40:46 2000
@@ -115,7 +115,7 @@
     return existing;
 
   Link_array<Translator_def> path
-    = unsmob_translator_def (definition_)->path_to_acceptable_translator 
(gh_str02scm (n.ch_C()), output_def_l ());
+    = unsmob_translator_def (definition_)->path_to_acceptable_translator 
(ly_str02scm ((char*)n.ch_C()), output_def_l ());
 
   if (path.size ())
     {


> 1.3.85 fails to compile. Thus:
> 
> c++ -c  -DHAVE_CONFIG_H  -DNPRINT -Iinclude -I./out -I../lib/include -I../lib
    + /./out -I../flower/include -I../flower/./out -I../flower/include -g     -
    + g   -DNPRINT -I/usr/include -Wall  -W -Wmissing-prototypes -Wmissing-decl
    + arations -Wconversion  translator-group.cc -o out/translator-group.o
> translator-group.cc: In method `class Translator_group * Translator_group::fi
    + nd_create_translator_l(String, String)':
> translator-group.cc:118: passing `const char *' as argument 1 of `gh_str02scm
    + (char *)' discards qualifiers
> make[1]: *** [out/translator-group.o] Error 1
> make[1]: Leaving directory `/usr/opt/src/lilypond-1.3.85/lily'
> make: *** [all] Error 2
> $ g++ --version
> 2.95.2
> 
> *whine* ;)
> 
>  _[Martin]_
> -- 
>         martin udden | address@hidden
> ----------------------------------------------------
> Jazz ain't dead, it just smells funny -- Frank Zappa
> _______________________________________________
> gnu-music-discuss mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/gnu-music-discuss
> 


-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org