Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/, dev-scheme/guile/
Date: Mon, 05 Oct 2020 19:04:18
Message-Id: 1601924639.3f32eaf545ba48564c1ba109fc2792079257032b.sam@gentoo
1 commit: 3f32eaf545ba48564c1ba109fc2792079257032b
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 5 19:03:20 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 5 19:03:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f32eaf5
7
8 dev-scheme/guile: fix 1.8.8 build with >=sys-apps/texinfo-6.7
9
10 Drop unicode.
11
12 Thanks-to: Dennis Nezic <dennisn <AT> dennisn.mooo.com>
13 Closes: https://bugs.gentoo.org/736469
14 Package-Manager: Portage-3.0.4, Repoman-3.0.1
15 Signed-off-by: Sam James <sam <AT> gentoo.org>
16
17 .../guile/files/guile-1.8.8-texinfo-6.7.patch | 22 ++++++++++++++++++++++
18 dev-scheme/guile/guile-1.8.8-r3.ebuild | 3 ++-
19 2 files changed, 24 insertions(+), 1 deletion(-)
20
21 diff --git a/dev-scheme/guile/files/guile-1.8.8-texinfo-6.7.patch b/dev-scheme/guile/files/guile-1.8.8-texinfo-6.7.patch
22 new file mode 100644
23 index 00000000000..6be52017a8d
24 --- /dev/null
25 +++ b/dev-scheme/guile/files/guile-1.8.8-texinfo-6.7.patch
26 @@ -0,0 +1,22 @@
27 +--- a/doc/ref/api-compound.texi.orig 2020-08-08 22:23:07.000000000 -0400
28 ++++ b/doc/ref/api-compound.texi 2020-08-08 22:23:33.000000000 -0400
29 +@@ -905,7 +905,7 @@
30 + @end deftypefn
31 +
32 + @deftypefn {C Function} {const SCM *} scm_vector_elements (SCM vec, scm_t_array_handle *handle, size_t *lenp, ssize_t *incp)
33 +-Acquire a handle for the vector @var{vec} and return a pointer to the
34 ++Acquire a handle for the vector @var{vec} and return a pointer to the
35 + elements of it. This pointer can only be used to read the elements of
36 + @var{vec}. When @var{vec} is not a vector, an error is signaled. The
37 + handle mustr eventually be released with
38 +--- a/doc/ref/guile.info-2.orig 2020-08-08 22:22:59.000000000 -0400
39 ++++ b/doc/ref/guile.info-2 2020-08-08 22:25:21.000000000 -0400
40 +@@ -4192,7 +4192,7 @@
41 +
42 + -- C Function: const SCM * scm_vector_elements (SCM vec,
43 + scm_t_array_handle *handle, size_t *lenp, ssize_t *incp)
44 +- Acquire a handle for the vector VEC and return a pointer to the
45 ++ Acquire a handle for the vector VEC and return a pointer to the
46 + elements of it. This pointer can only be used to read the
47 + elements of VEC. When VEC is not a vector, an error is signaled.
48 + The handle mustr eventually be released with
49
50 diff --git a/dev-scheme/guile/guile-1.8.8-r3.ebuild b/dev-scheme/guile/guile-1.8.8-r3.ebuild
51 index bd0e2037354..48800f8ea22 100644
52 --- a/dev-scheme/guile/guile-1.8.8-r3.ebuild
53 +++ b/dev-scheme/guile/guile-1.8.8-r3.ebuild
54 @@ -40,7 +40,8 @@ src_prepare() {
55 "${FILESDIR}/${P}-readline.patch" \
56 "${FILESDIR}/${P}-tinfo.patch" \
57 "${FILESDIR}/${P}-sandbox.patch" \
58 - "${FILESDIR}/${P}-mkdir-mask.patch"
59 + "${FILESDIR}/${P}-mkdir-mask.patch" \
60 + "${FILESDIR}/${PN}-1.8.8-texinfo-6.7.patch"
61
62 sed \
63 -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \