CVS commit: pkgsrc/inputmethod/fcitx

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Fri Aug 28 01:52:12 UTC 2026

Modified Files:
        pkgsrc/inputmethod/fcitx: distinfo
Added Files:
        pkgsrc/inputmethod/fcitx/patches: patch-src_im_pinyin_sp.c
            patch-tools_cli_txt2mb.c

Log Message:
fctix: add missing ctype abuse fix patches

Two patches from the netbsd-11 ctype-abuse fixes of 2025-12-07 were
listed in distinfo r1.8 but apparently never committed.
 https://mail-index.netbsd.org/pkgsrc-changes/2025/12/07/msg335023.html

This should fix bulk build on NetBSD 11.0 hosts, and
should be pulled up to pkgsrc-2026Q2.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/inputmethod/fcitx/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/fcitx/patches/patch-src_im_pinyin_sp.c \
    pkgsrc/inputmethod/fcitx/patches/patch-tools_cli_txt2mb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/fcitx/distinfo
diff -u pkgsrc/inputmethod/fcitx/distinfo:1.9 pkgsrc/inputmethod/fcitx/distinfo:1.10
--- pkgsrc/inputmethod/fcitx/distinfo:1.9       Sat Jun 20 09:29:04 2026
+++ pkgsrc/inputmethod/fcitx/distinfo   Fri Aug 28 01:52:12 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2026/06/20 09:29:04 nia Exp $
+$NetBSD: distinfo,v 1.10 2026/08/28 01:52:12 tsutsui Exp $
 
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -22,6 +22,7 @@ SHA1 (patch-CMakeLists.txt) = 2267345895
 SHA1 (patch-cmake_FcitxMacro.cmake) = e3dcba315711fc6b96f5620de1e03e096635bab2
 SHA1 (patch-cmake_FindEnchant.cmake) = e2a2572d60515c80ec736dd1d8d07779aa324da0
 SHA1 (patch-src_im_pinyin_data_CMakeLists.txt) = dd17df37a5b6781a645a4190cb8111811f804189
+SHA1 (patch-src_im_pinyin_sp.c) = 4b86b6cde68da23d6d3f525dcd620497aedebd70
 SHA1 (patch-src_im_table_data_CMakeLists.txt) = 3ef3d05ee036f9bb845b69c97c50ac76cc11478e
 SHA1 (patch-src_lib_fcitx-config_hotkey.c) = bacd46f4d716c8175e5ab86cb08b95212e1e6df3
 SHA1 (patch-src_lib_fcitx-utils_utils.c) = 15c0f9d9123edd44b95aaf0b2f7b636779f98df6
@@ -36,3 +37,4 @@ SHA1 (patch-src_module_vk_vk.c) = cc3f21
 SHA1 (patch-src_ui_classic_skin.c) = 7d14955a3503a6d866b0a6495722c78be0029e0d
 SHA1 (patch-src_ui_kimpanel_kimpanel.c) = a0325039b35271d297a1b2ec1eeaa10899072f48
 SHA1 (patch-tools_cli_mb2txt.c) = 3eb771cb13ed9b6f0dc28ec301460314a4966639
+SHA1 (patch-tools_cli_txt2mb.c) = 767eff65d9bab6b11b457851f2cfa29172d6a5ce

Added files:

Index: pkgsrc/inputmethod/fcitx/patches/patch-src_im_pinyin_sp.c
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-src_im_pinyin_sp.c:1.1
--- /dev/null   Fri Aug 28 01:52:12 2026
+++ pkgsrc/inputmethod/fcitx/patches/patch-src_im_pinyin_sp.c   Fri Aug 28 01:52:12 2026
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_im_pinyin_sp.c,v 1.1 2026/08/28 01:52:12 tsutsui Exp $
+
+Fix ctype abuse by casting to unsigned char
+
+--- src/im/pinyin/sp.c.orig    2026-08-28 01:41:25.905117302 +0000
++++ src/im/pinyin/sp.c
+@@ -137,7 +137,7 @@ void LoadSPData(FcitxPinyinState *pystat
+                 continue;
+ 
+             if (pstr[0] == '=') //是零声母设置
+-                pyconfig->cNonS = tolower(pstr[1]);
++                pyconfig->cNonS = tolower((unsigned char) pstr[1]);
+             else {
+                 i = 0;
+ 
+@@ -150,12 +150,12 @@ void LoadSPData(FcitxPinyinState *pystat
+                         i = GetSPIndexQP_S(pyconfig, strS);
+ 
+                         if (i != -1)
+-                            SPMap_S[i].cJP = tolower(pstr[1]);
++                            SPMap_S[i].cJP = tolower((unsigned char) pstr[1]);
+                         else {
+                             i = GetSPIndexQP_C(pyconfig, strS);
+ 
+                             if (i != -1)
+-                                SPMap_C[i].cJP = tolower(pstr[1]);
++                                SPMap_C[i].cJP = tolower((unsigned char) pstr[1]);
+                         }
+ 
+                         break;
Index: pkgsrc/inputmethod/fcitx/patches/patch-tools_cli_txt2mb.c
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-tools_cli_txt2mb.c:1.1
--- /dev/null   Fri Aug 28 01:52:12 2026
+++ pkgsrc/inputmethod/fcitx/patches/patch-tools_cli_txt2mb.c   Fri Aug 28 01:52:12 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-tools_cli_txt2mb.c,v 1.1 2026/08/28 01:52:12 tsutsui Exp $
+
+Fix ctype abuse by casting to unsigned char
+
+--- tools/cli/txt2mb.c.orig    2026-08-28 01:40:49.733711639 +0000
++++ tools/cli/txt2mb.c
+@@ -361,13 +361,13 @@ int main(int argc, char *argv[])
+         buf1 = fcitx_utils_trim(buf);
+         char *p = buf1;
+ 
+-        while (*p && !isspace(*p))
++        while (*p && !isspace((unsigned char) *p))
+             p ++;
+ 
+         if (*p == '\0')
+             continue;
+ 
+-        while (isspace(*p)) {
++        while (isspace((unsigned char) *p)) {
+             *p = '\0';
+             p ++;
+         }