[Gsrc-commit] /srv/bzr/gsrc/trunk r1977: fix guile build with newer texinfo

[Brandon Invergo]

------------------------------------------------------------
revno: 1977
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-18 20:29:13 +0100
message:
  fix guile build with newer texinfo
added:
  gnu/guile/files/
  gnu/guile/files/guile-2.0.7-fix-info.diff
modified:
  gnu/guile/Makefile
  gnu/guile/sha256sums

=== modified file 'gnu/guile/Makefile'
--- a/gnu/guile/Makefile        2012-12-16 22:50:44 +0000
+++ b/gnu/guile/Makefile        2013-03-18 19:29:13 +0000
@@ -10,6 +10,7 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
+PATCHFILES = $(DISTNAME)-fix-info.diff
 
 BUILDDEPS = 
 LIBDEPS = gc gmp libtool readline libunistring libffi

=== added directory 'gnu/guile/files'
=== added file 'gnu/guile/files/guile-2.0.7-fix-info.diff'
--- a/gnu/guile/files/guile-2.0.7-fix-info.diff 1970-01-01 00:00:00 +0000
+++ b/gnu/guile/files/guile-2.0.7-fix-info.diff 2013-03-18 19:29:13 +0000
@@ -0,0 +1,33 @@
+This patch fixes errors produced when generating the documentation with 
+Texinfo 5.1.
+
+diff -x config.log -x config.status -ru 
work/guile-2.0.7/doc/ref/api-control.texi 
work/guile-2.0.7/doc/ref/api-control.texi
+--- work/guile-2.0.7/doc/ref/api-control.texi  2012-07-06 22:09:10.000000000 
+0200
++++ work/guile-2.0.7/doc/ref/api-control.texi  2013-03-18 20:23:59.863517783 
+0100
+@@ -1732,8 +1732,8 @@
+ @deftypefnx {C Function} void scm_wrong_type_arg (char address@hidden, int 
@var{argnum}, SCM @var{bad_value})
+ @deftypefnx {C Function} void scm_wrong_type_arg_msg (char address@hidden, 
int @var{argnum}, SCM @var{bad_value}, const char address@hidden)
+ @deftypefnx {C Function} void scm_memory_error (char address@hidden)
+-Throw an error with the various keys described above.
+ @deftypefnx {C Function} void scm_misc_error (const char address@hidden, 
const char address@hidden, SCM @var{args})
++Throw an error with the various keys described above.
+ 
+ In @code{scm_wrong_num_args}, @var{proc} should be a Scheme symbol
+ which is the name of the procedure incorrectly invoked.  The other
+ 
+diff -x config.log -x config.status -ru work/guile-2.0.7/doc/ref/r6rs.texi 
work/guile-2.0.7/doc/ref/r6rs.texi
+--- work/guile-2.0.7/doc/ref/r6rs.texi 2012-11-27 00:10:24.000000000 +0100
++++ work/guile-2.0.7/doc/ref/r6rs.texi 2013-03-18 20:25:20.580188920 +0100
+@@ -273,10 +273,8 @@
+ @end deffn
+ 
+ @deffn {Scheme Syntax} define-syntax keyword expression
address@hidden {Scheme Syntax} let-syntax ((keyword transformer) @dots{})
+-                        exp1 exp2 @dots{}
address@hidden {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{})
+-                        exp1 exp2 @dots{}
address@hidden {Scheme Syntax} let-syntax ((keyword transformer) @dots{}) exp1 
exp2 @dots{}
address@hidden {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{}) 
exp1 exp2 @dots{}
+ @xref{Defining Macros}, for documentation.
+ @end deffn
+ 

=== modified file 'gnu/guile/sha256sums'
--- a/gnu/guile/sha256sums      2012-11-30 17:41:15 +0000
+++ b/gnu/guile/sha256sums      2013-03-18 19:29:13 +0000
@@ -1,2 +1,3 @@
 043ae7a44aefaec2b2fe6cd09b0e31e206340633aa4b53df88684d808890fc63  
download/guile-2.0.7.tar.gz
+292b23fa707d791f0d650985dad4b2703e9ef45d4990c262894f8e4135a6ff6b  
download/guile-2.0.7-fix-info.diff
 dc3da05d3e25633d928f8d256921b89615aa547ffc5f6fed42462636f4fd255a  
download/guile-2.0.7.tar.gz.sig