Attachment 239333 Details for Bug 268815 – japanese/kakasi: fix build with clang 15

[patch] japanese/kakasi: fix build with clang 15

japanese__kakasi-fix-clang15-build-1.diff (text/plain), 1.41 KB, created by Dimitry Andric on 2023-01-07 15:56:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2023-01-07 15:56:42 UTC

Size: 1.41 KB

patch

obsolete

>commit fcc291457e533a5cf3a3beabb4b63cc5aa6144e3
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Sat Jan 7 16:53:53 2023 +0100
>
>    japanese/kakasi: fix build with clang 15
>    
>    During an exp-run for llvm 15 (see bug 265425), it turned out that
>    japanese/kakasi failed to build with clang 15:
>    
>      kanjiio.c:1083:11: error: incompatible integer to pointer conversion assigning to 'iconv_t' (aka 'struct __tag_iconv_t *') from 'int' [-Wint-conversion]
>              fromutf8 = -1;
>                       ^ ~~
>      kanjiio.c:1087:9: error: incompatible integer to pointer conversion assigning to 'iconv_t' (aka 'struct __tag_iconv_t *') from 'int' [-Wint-conversion]
>              toutf8 = -1;
>                     ^ ~~
>    
>    This is because 'fromutf8' and 'toutf8' are of pointer type, not int.
>    Add a cast to silence the warning.
>
>diff --git a/japanese/kakasi/files/patch-src_kanjiio.c b/japanese/kakasi/files/patch-src_kanjiio.c
>new file mode 100644
>index 000000000000..ad81fa336fc8
>--- /dev/null
>+++ b/japanese/kakasi/files/patch-src_kanjiio.c
>@@ -0,0 +1,16 @@
>+--- src/kanjiio.c.orig	2013-02-07 07:26:18 UTC
>++++ src/kanjiio.c
>+@@ -1080,11 +1080,11 @@ close_iconv()
>+ {
>+     if (fromutf8 != -1) {
>+ 	iconv_close(fromutf8);
>+-	fromutf8 = -1;
>++	fromutf8 = (iconv_t) -1;
>+     }
>+     if (toutf8 != -1) {
>+ 	iconv_close(toutf8);
>+-	toutf8 = -1;
>++	toutf8 = (iconv_t) -1;
>+     }
>+ }
>+ #endif /* KAKASI_SUPPORT_UTF8 */

Actions: View | Diff

Attachments on bug 268815: 239333