On Tue, Dec 24, 2013 at 09:08:33PM +0000, Dimitri John Ledkov wrote: > The r5rs.texi document can be fixed by importing fixes from guile-2.0 code > base. > > Build further fails for me at test-suite however. > > Updated debdiff attached.
Here's the remaining piece, on top of Dimitri's patch. -- Colin Watson [cjwat...@ubuntu.com]
* Hack around formfeed differences in texinfo 5 (closes: #711029). diff -Nru guile-1.8-1.8.8+1/debian/patches/formfeed-hack.patch guile-1.8-1.8.8+1/debian/patches/formfeed-hack.patch --- guile-1.8-1.8.8+1/debian/patches/formfeed-hack.patch 1970-01-01 01:00:00.000000000 +0100 +++ guile-1.8-1.8.8+1/debian/patches/formfeed-hack.patch 2014-02-04 17:54:25.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Hack around formfeed differences in texinfo 5 + The version of makeinfo in texinfo 5.2 (at least) emits + slightly-differently-formatted output that breaks ice-9/documentation.scm, + and hence the test suite. Later versions of Guile implement their own + texinfo parsing and thus no longer rely on makeinfo for this, but this + workaround is enough to fix the test suite for now. +Author: Colin Watson <cjwat...@ubuntu.com> +Bug-Debian: http://bugs.debian.org/711029 +Forwarded: no +Last-Update: 2014-02-04 + +Index: b/libguile/Makefile.am +=================================================================== +--- a/libguile/Makefile.am ++++ b/libguile/Makefile.am +@@ -304,7 +304,7 @@ + + guile-procedures.txt: guile-procedures.texi + rm -f $@ +- makeinfo --force -o $@ guile-procedures.texi || test -f $@ ++ makeinfo --force --no-headers guile-procedures.texi | sed 's/ */ /g' > $@ + + else + diff -Nru guile-1.8-1.8.8+1/debian/patches/series guile-1.8-1.8.8+1/debian/patches/series --- guile-1.8-1.8.8+1/debian/patches/series 2013-12-24 21:22:38.000000000 +0000 +++ guile-1.8-1.8.8+1/debian/patches/series 2014-02-04 18:01:24.000000000 +0000 @@ -8,3 +8,4 @@ fix-texinfo-warning.patch cherry-pick-texi-formatting.patch automake-serial.patch +formfeed-hack.patch
