Re: lilypond-1.5.14 compilation problem

[Jan Nieuwenhuizen]

David Pirotte <address@hidden> writes:

> for information, lilypond-1.5.14 compilation problem on my SuSE linux 7.2

try this patch

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

usage 

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

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

diff -purN ../lilypond-1.5.14/CHANGES ./CHANGES
--- ../lilypond-1.5.14/CHANGES  Sat Sep 29 13:09:44 2001
+++ ./CHANGES   Sat Sep 29 22:53:29 2001
@@ -1,3 +1,13 @@
+1.5.14.jcn1
+===========
+
+* Guile > 1.4 compilation fixes.
+
+* Website bugfix: mailto: (thanks David Boersma).
+
+1.5.14
+======
+
 1.5.13.hwn2
 ===========
 
diff -purN ../lilypond-1.5.14/Documentation/footer.html.in 
./Documentation/footer.html.in
--- ../lilypond-1.5.14/Documentation/footer.html.in     Thu Aug 23 15:39:08 2001
+++ ./Documentation/footer.html.in      Sat Sep 29 22:50:54 2001
@@ -24,7 +24,7 @@ Please send GNU LilyPond questions and c
 <p>
 
 Please send comments on these web pages to 
-<a href="mailto:@MAIL_ADDRESS@";><em>@MAIL_ADDRESS@</em></a>
+<a href="mailto:@MAILADDRESS@";><em>@MAILADDRESS@</em></a>
 
 <p>
 
diff -purN ../lilypond-1.5.14/VERSION ./VERSION
--- ../lilypond-1.5.14/VERSION  Sat Sep 29 13:09:57 2001
+++ ./VERSION   Sat Sep 29 22:14:28 2001
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=14
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff -purN ../lilypond-1.5.14/lily/include/lily-guile.hh 
./lily/include/lily-guile.hh
--- ../lilypond-1.5.14/lily/include/lily-guile.hh       Sat Sep 29 01:48:27 2001
+++ ./lily/include/lily-guile.hh        Sat Sep 29 22:16:16 2001
@@ -48,6 +48,8 @@
 #define scm_list_n scm_listify
 #define SCM_STRING_CHARS SCM_CHARS
 #define SCM_STRING_LENGTH SCM_LENGTH
+#define SCM_SYMBOL_CHARS SCM_CHARS
+#define SCM_SYMBOL_LENGTH SCM_LENGTH
 #endif
 
 
diff -purN ../lilypond-1.5.14/lily/scm-hash.cc ./lily/scm-hash.cc
--- ../lilypond-1.5.14/lily/scm-hash.cc Thu Sep 27 01:54:34 2001
+++ ./lily/scm-hash.cc  Sat Sep 29 22:29:35 2001
@@ -14,7 +14,7 @@
 void
 copy_scm_hashes (SCM dest, SCM src)
 {
-  for (int i = SCM_LENGTH(src); i--;)
+  for (int i = SCM_SYMBOL_LENGTH (src); i--;)
     for (SCM s = scm_vector_ref (src, SCM_MAKINUM (i)); ly_pair_p(s); s = 
ly_cdr (s))
       {
        scm_hashq_set_x (dest, ly_caar (s), ly_cdar (s));
@@ -108,7 +108,7 @@ Scheme_hash_table::set (SCM k, SCM v)
   /*
     resize if getting too large.
   */
-  if (elt_count_ > 2 * SCM_LENGTH (hash_tab_))
+  if (elt_count_ > 2 * SCM_SYMBOL_LENGTH (hash_tab_))
     {
       SCM nh = scm_make_vector (gh_int2scm (3* elt_count_+1), SCM_EOL);
       copy_scm_hashes (nh, hash_tab_);
@@ -142,7 +142,7 @@ SCM
 Scheme_hash_table::to_alist () const
 {
   SCM l = SCM_EOL;
-  for (int i = SCM_LENGTH(hash_tab_); i--;)
+  for (int i = SCM_SYMBOL_LENGTH (hash_tab_); i--;)
     for (SCM s = scm_vector_ref (hash_tab_, gh_int2scm (i)); ly_pair_p(s); s = 
ly_cdr (s))
       {
        l = scm_acons (ly_caar (s), ly_cdar (s), l);
diff -purN ../lilypond-1.5.14/lily/translator.cc ./lily/translator.cc
--- ../lilypond-1.5.14/lily/translator.cc       Mon Sep 24 01:04:29 2001
+++ ./lily/translator.cc        Sat Sep 29 22:18:40 2001
@@ -160,7 +160,7 @@ Translator::name (SCM trans) 
   if (unsmob_translator (trans))
     {
       char const* nm = classname (unsmob_translator (trans));
-      return gh_str02scm (nm);
+      return ly_str02scm (nm);
     }
   return
     SCM_EOL;
diff -purN ../lilypond-1.5.14/stepmake/bin/add-html-footer.py 
./stepmake/bin/add-html-footer.py
--- ../lilypond-1.5.14/stepmake/bin/add-html-footer.py  Mon Sep 17 12:08:15 2001
+++ ./stepmake/bin/add-html-footer.py   Sat Sep 29 22:52:10 2001
@@ -42,7 +42,7 @@ built = r"""<hr>
 <p><font size="-1">
 This page was built from @address@hidden@PACKAGE_VERSION@ by<br>
 </font>
-<address><font size="-1">@GCOS@ &lt;<a href="mailto:%s";>@MAIL_ADDRESS@</a>&gt;,
+<address><font size="-1">@GCOS@ &lt;<a href="mailto:%s";>@MAILADDRESS@</a>&gt;,
 @address@hidden</font></address>"""
 
 
@@ -226,7 +226,7 @@ def do_file (f):
        s = re.sub ('@WEBMASTER@', webmaster, s)
        s = re.sub ('@GCOS@', gcos, s)
        s = re.sub ('@LOCALTIME@', localtime, s)
-       s = re.sub ('@MAIL_ADDRESS@', mail_address, s)
+       s = re.sub ('@MAILADDRESS@', mail_address, s)
 
        m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
        while m:

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