| 1 |
commit: 3b9037031dd5e022577842a92eada5e31fb50e91 |
| 2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 12 14:51:28 2020 +0000 |
| 4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 12 14:59:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b903703 |
| 7 |
|
| 8 |
dev-scheme/c-wrapper: fix build with >=sys-apps/texinfo-6.7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/696044 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 12 |
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild | 3 +- |
| 15 |
.../c-wrapper/files/c-wrapper-texinfo-6.7.patch | 34 ++++++++++++++++++++++ |
| 16 |
2 files changed, 36 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild |
| 19 |
index 4bf3c117c0b..a5848a95ce2 100644 |
| 20 |
--- a/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild |
| 21 |
+++ b/dev-scheme/c-wrapper/c-wrapper-0.6.1-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2019 Gentoo Authors |
| 24 |
+# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI="6" |
| 28 |
@@ -24,6 +24,7 @@ PATCHES=( |
| 29 |
"${FILESDIR}"/${PN}-gentoo.patch |
| 30 |
"${FILESDIR}"/${PN}-glibc-2.25.patch |
| 31 |
"${FILESDIR}"/${PN}-info.patch |
| 32 |
+ "${FILESDIR}"/${PN}-texinfo-6.7.patch |
| 33 |
) |
| 34 |
HTML_DOCS=( doc/${PN}-ref{e,j}.html ) |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch |
| 38 |
new file mode 100644 |
| 39 |
index 00000000000..97acd86470e |
| 40 |
--- /dev/null |
| 41 |
+++ b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch |
| 42 |
@@ -0,0 +1,34 @@ |
| 43 |
+--- a/doc/c-wrapper-ref.texi |
| 44 |
++++ b/doc/c-wrapper-ref.texi |
| 45 |
+@@ -14,7 +14,7 @@ |
| 46 |
+ @direntry |
| 47 |
+ * c-wrapper reference: (c-wrapper-refj.info). A generic wrapper for C libraries. |
| 48 |
+ @end direntry |
| 49 |
+-@documentencoding euc-jp |
| 50 |
++@documentencoding UTF-8 |
| 51 |
+ @c COMMON |
| 52 |
+ @comment %**end of header |
| 53 |
+ |
| 54 |
+--- a/doc/extract |
| 55 |
++++ b/doc/extract |
| 56 |
+@@ -138,8 +138,6 @@ |
| 57 |
+ ((en) (filter #/^@c EN$/ #/^@c JP$/)) |
| 58 |
+ ((jp) (filter #/^@c JP$/ #/^@c EN$/)))) |
| 59 |
+ |
| 60 |
+- (define outenc (if (eq? *lang* 'jp) 'euc-jp 'utf8)) |
| 61 |
+- |
| 62 |
+ (unless (= (length a) 1) (usage)) |
| 63 |
+ |
| 64 |
+ (when (eq? *lang* 'jp) |
| 65 |
+@@ -148,9 +146,9 @@ |
| 66 |
+ (with-input-from-file (car a) |
| 67 |
+ (lambda () |
| 68 |
+ (if *outfile* |
| 69 |
+- (with-output-to-file *outfile* do-it :encoding outenc) |
| 70 |
++ (with-output-to-file *outfile* do-it :encoding 'utf8) |
| 71 |
+ (let1 out (open-output-conversion-port |
| 72 |
+- (current-output-port) outenc) |
| 73 |
++ (current-output-port) 'utf8) |
| 74 |
+ (with-output-to-port out do-it) |
| 75 |
+ (close-output-port out)))) |
| 76 |
+ :encoding 'euc-jp) |
Archives