[dylan][PATCH 0/2] Texinfo fixes for dylan

[dylan][PATCH 0/2] Texinfo fixes for dylan

[Paul Eggleton]

One backport from master (already in dora) and one dylan-specific patch
to fix failures building dylan on newer distributions such as Ubuntu 13.10.


The following changes since commit bca606597de6c5c2de98ae1949857e4481623939:

  build-appliance-image: Update to dylan head revision (2014-01-15 17:49:59 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/dylan-next
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/dylan-next

Paul Eggleton (1):
  guile: fix build with Texinfo 5.0

Saul Wold (1):
  grep: Add patch for texinfo 5.1

 .../0001-doc-Fix-build-with-Texinfo-5.0.patch      | 71 ++++++++++++++++++++++
 meta/recipes-devtools/guile/guile_2.0.7.bb         |  1 +
 .../grep/grep-2.5.1a/fix-for-texinfo-5.1.patch     | 13 ++++
 meta/recipes-extended/grep/grep_2.5.1a.bb          |  1 +
 4 files changed, 86 insertions(+)
 create mode 100644 meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
 create mode 100644 meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch

-- 
1.8.4.2

[dylan][PATCH 1/2] grep: Add patch for texinfo 5.1

[Paul Eggleton]

From: Saul Wold <sgw@linux.intel.com>

(From OE-Core master rev: bc6258f88705b0e7989089a8666ac5e5d2355823)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../grep/grep-2.5.1a/fix-for-texinfo-5.1.patch              | 13 +++++++++++++
 meta/recipes-extended/grep/grep_2.5.1a.bb                   |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch

diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
new file mode 100644
index 0000000..02dbd20
--- /dev/null
+++ b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch
@@ -0,0 +1,13 @@
+Index: grep-2.5.1a/doc/grep.texi
+===================================================================
+--- grep-2.5.1a.orig/doc/grep.texi
++++ grep-2.5.1a/doc/grep.texi
+@@ -288,7 +288,7 @@ This version number should be included i
+ Print a usage message briefly summarizing these command-line options
+ and the bug-reporting address, then exit.
+ 
+-@itemx --binary-files=@var{type}
++@item --binary-files=@var{type}
+ @opindex --binary-files
+ @cindex binary files
+ If the first few bytes of a file indicate that the file contains binary
diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb
index 247c837..088959c 100644
--- a/meta/recipes-extended/grep/grep_2.5.1a.bb
+++ b/meta/recipes-extended/grep/grep_2.5.1a.bb
@@ -14,6 +14,7 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \
            file://fix64-int-to-pointer.patch \
            file://Makevars \
            file://grep-CVE-2012-5667.patch \
+           file://fix-for-texinfo-5.1.patch \
           "
 
 SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c"
-- 
1.8.4.2

[dylan][PATCH 2/2] guile: fix build with Texinfo 5.0

[Paul Eggleton]

Backport a patch from upstream which fixes failures building
guile-native on newer distros such as Ubuntu 13.10. (This does not
affect dora or master because we are using Guile 2.0.9 there, which
already contains this patch.)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 .../0001-doc-Fix-build-with-Texinfo-5.0.patch      | 71 ++++++++++++++++++++++
 meta/recipes-devtools/guile/guile_2.0.7.bb         |  1 +
 2 files changed, 72 insertions(+)
 create mode 100644 meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch

diff --git a/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch b/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
new file mode 100644
index 0000000..f39905c
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/0001-doc-Fix-build-with-Texinfo-5.0.patch
@@ -0,0 +1,71 @@
+From 183d2ace576710079a2bcf2a8bfcbc39b7d9becc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
+Date: Fri, 1 Mar 2013 17:49:24 +0100
+Subject: [PATCH] doc: Fix build with Texinfo 5.0.
+
+* doc/ref/api-control.texi (Handling Errors): Move misplaced description
+  for `scm_memory_error' & co.
+* doc/ref/r6rs.texi (rnrs base): Change `deffnx' of `let-syntax' and
+  `letrec-syntax' to fit on one line.
+
+Upstream-Status: Backport [in 2.0.9 release]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+---
+ doc/ref/api-control.texi | 6 +++---
+ doc/ref/r6rs.texi        | 8 +++-----
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/doc/ref/api-control.texi b/doc/ref/api-control.texi
+index 95c4925..ea943d3 100644
+--- a/doc/ref/api-control.texi
++++ b/doc/ref/api-control.texi
+@@ -1,7 +1,7 @@
+ @c -*-texinfo-*-
+ @c This is part of the GNU Guile Reference Manual.
+-@c Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010, 2011, 2012
+-@c   Free Software Foundation, Inc.
++@c Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009, 2010,
++@c   2011, 2012, 2013 Free Software Foundation, Inc.
+ @c See the file guile.texi for copying conditions.
+ 
+ @node Control Mechanisms
+@@ -1732,8 +1732,8 @@ and the call to these routines doesn't change @code{errno}.
+ @deftypefnx {C Function} void scm_wrong_type_arg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value})
+ @deftypefnx {C Function} void scm_wrong_type_arg_msg (char *@var{subr}, int @var{argnum}, SCM @var{bad_value}, const char *@var{expected})
+ @deftypefnx {C Function} void scm_memory_error (char *@var{subr})
+-Throw an error with the various keys described above.
+ @deftypefnx {C Function} void scm_misc_error (const char *@var{subr}, const char *@var{message}, 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 --git a/doc/ref/r6rs.texi b/doc/ref/r6rs.texi
+index 2028ada..13f9e20 100644
+--- a/doc/ref/r6rs.texi
++++ b/doc/ref/r6rs.texi
+@@ -1,6 +1,6 @@
+ @c -*-texinfo-*-
+ @c This is part of the GNU Guile Reference Manual.
+-@c Copyright (C)  2010, 2011, 2012
++@c Copyright (C)  2010, 2011, 2012, 2013
+ @c   Free Software Foundation, Inc.
+ @c See the file guile.texi for copying conditions.
+ 
+@@ -273,10 +273,8 @@ grouped below by the existing manual sections to which they correspond.
+ @end deffn
+ 
+ @deffn {Scheme Syntax} define-syntax keyword expression
+-@deffnx {Scheme Syntax} let-syntax ((keyword transformer) @dots{})
+-                        exp1 exp2 @dots{}
+-@deffnx {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{})
+-                        exp1 exp2 @dots{}
++@deffnx {Scheme Syntax} let-syntax ((keyword transformer) @dots{}) exp1 exp2 @dots{}
++@deffnx {Scheme Syntax} letrec-syntax ((keyword transformer) @dots{}) exp1 exp2 @dots{}
+ @xref{Defining Macros}, for documentation.
+ @end deffn
+ 
+-- 
+1.8.4.2
+
diff --git a/meta/recipes-devtools/guile/guile_2.0.7.bb b/meta/recipes-devtools/guile/guile_2.0.7.bb
index 5863014..e7191a7 100644
--- a/meta/recipes-devtools/guile/guile_2.0.7.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.7.bb
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
            file://guile_2.0.6_fix_sed_error.patch \
            file://arm_endianness.patch \
            file://fix_parallel_build_issue.patch \
+           file://0001-doc-Fix-build-with-Texinfo-5.0.patch \
            "
 
 #           file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
-- 
1.8.4.2