diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-14 11:09:11 +0100 |
| commit | deba8115d2c2af26df42966b91ef04ff4dd79cde (patch) | |
| tree | 9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-scheme/c-wrapper/files | |
| parent | 38423c67c8a23f6a1bc42038193182e2da3116eb (diff) | |
gentoo resync : 14.05.2020
Diffstat (limited to 'dev-scheme/c-wrapper/files')
| -rw-r--r-- | dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch | 6 | ||||
| -rw-r--r-- | dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch | 34 |
2 files changed, 39 insertions, 1 deletions
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch index 091b1e2da105..98dfaa2f945c 100644 --- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch +++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch @@ -8,7 +8,7 @@ /* skip the first line '# 1 "<stdin>"' */ Scm_ReadLineUnsafe(SCM_PORT(in)); -@@ -1682,16 +1683,26 @@ +@@ -1682,16 +1683,30 @@ } } @@ -28,7 +28,11 @@ - parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str); } + while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in))) ++#ifdef SCM_REGEXP_MULTI_LINE ++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) { ++#else + && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) { ++#endif + if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) { + Scm_Error("[bug] unexpected EOF while parsing macro body"); + } 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 new file mode 100644 index 000000000000..97acd86470eb --- /dev/null +++ b/dev-scheme/c-wrapper/files/c-wrapper-texinfo-6.7.patch @@ -0,0 +1,34 @@ +--- a/doc/c-wrapper-ref.texi ++++ b/doc/c-wrapper-ref.texi +@@ -14,7 +14,7 @@ + @direntry + * c-wrapper reference: (c-wrapper-refj.info). A generic wrapper for C libraries. + @end direntry +-@documentencoding euc-jp ++@documentencoding UTF-8 + @c COMMON + @comment %**end of header + +--- a/doc/extract ++++ b/doc/extract +@@ -138,8 +138,6 @@ + ((en) (filter #/^@c EN$/ #/^@c JP$/)) + ((jp) (filter #/^@c JP$/ #/^@c EN$/)))) + +- (define outenc (if (eq? *lang* 'jp) 'euc-jp 'utf8)) +- + (unless (= (length a) 1) (usage)) + + (when (eq? *lang* 'jp) +@@ -148,9 +146,9 @@ + (with-input-from-file (car a) + (lambda () + (if *outfile* +- (with-output-to-file *outfile* do-it :encoding outenc) ++ (with-output-to-file *outfile* do-it :encoding 'utf8) + (let1 out (open-output-conversion-port +- (current-output-port) outenc) ++ (current-output-port) 'utf8) + (with-output-to-port out do-it) + (close-output-port out)))) + :encoding 'euc-jp) |