CVS commit: pkgsrc/inputmethod/fcitx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jun 20 09:29:04 UTC 2026

Modified Files:
        pkgsrc/inputmethod/fcitx: Makefile PLIST distinfo
Added Files:
        pkgsrc/inputmethod/fcitx/patches: patch-CMakeLists.txt
            patch-src_module_spell_spell.c

Log Message:
fcitx: Various build fixes.

- Need to include <strings.h> to use index(3).
- Honour the OS/user's PKGMANDIR choice.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/inputmethod/fcitx/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/inputmethod/fcitx/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/inputmethod/fcitx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/inputmethod/fcitx/patches/patch-CMakeLists.txt \
    pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell.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/Makefile
diff -u pkgsrc/inputmethod/fcitx/Makefile:1.64 pkgsrc/inputmethod/fcitx/Makefile:1.65
--- pkgsrc/inputmethod/fcitx/Makefile:1.64      Thu Jun 11 07:17:13 2026
+++ pkgsrc/inputmethod/fcitx/Makefile   Sat Jun 20 09:29:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2026/06/11 07:17:13 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2026/06/20 09:29:04 nia Exp $
 
 DISTNAME=              fcitx-4.2.9.6
 PKGREVISION=           40
@@ -66,6 +66,7 @@ post-extract:
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../textproc/enchant2/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"

Index: pkgsrc/inputmethod/fcitx/PLIST
diff -u pkgsrc/inputmethod/fcitx/PLIST:1.5 pkgsrc/inputmethod/fcitx/PLIST:1.6
--- pkgsrc/inputmethod/fcitx/PLIST:1.5  Mon Oct 28 12:38:48 2019
+++ pkgsrc/inputmethod/fcitx/PLIST      Sat Jun 20 09:29:04 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/10/28 12:38:48 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.6 2026/06/20 09:29:04 nia Exp $
 bin/createPYMB
 bin/fcitx
 bin/fcitx-autostart
@@ -124,6 +124,15 @@ lib/pkgconfig/fcitx-config.pc
 lib/pkgconfig/fcitx-gclient.pc
 lib/pkgconfig/fcitx-utils.pc
 lib/pkgconfig/fcitx.pc
+man/man1/createPYMB.1
+man/man1/fcitx-remote.1
+man/man1/fcitx.1
+man/man1/mb2org.1
+man/man1/mb2txt.1
+man/man1/readPYBase.1
+man/man1/readPYMB.1
+man/man1/scel2org.1
+man/man1/txt2mb.1
 share/applications/fcitx-configtool.desktop
 share/applications/fcitx-skin-installer.desktop
 share/applications/fcitx.desktop
@@ -417,13 +426,4 @@ share/locale/ko/LC_MESSAGES/fcitx.mo
 share/locale/ru/LC_MESSAGES/fcitx.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx.mo
-share/man/man1/createPYMB.1
-share/man/man1/fcitx-remote.1
-share/man/man1/fcitx.1
-share/man/man1/mb2org.1
-share/man/man1/mb2txt.1
-share/man/man1/readPYBase.1
-share/man/man1/readPYMB.1
-share/man/man1/scel2org.1
-share/man/man1/txt2mb.1
 share/mime/packages/x-fskin.xml

Index: pkgsrc/inputmethod/fcitx/distinfo
diff -u pkgsrc/inputmethod/fcitx/distinfo:1.8 pkgsrc/inputmethod/fcitx/distinfo:1.9
--- pkgsrc/inputmethod/fcitx/distinfo:1.8       Sun Dec  7 03:00:55 2025
+++ pkgsrc/inputmethod/fcitx/distinfo   Sat Jun 20 09:29:04 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2025/12/07 03:00:55 maya Exp $
+$NetBSD: distinfo,v 1.9 2026/06/20 09:29:04 nia Exp $
 
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
@@ -18,10 +18,10 @@ Size (py_table-20121124.tar.gz) = 186822
 BLAKE2s (table.tar.gz) = c4f966243472256e078db4e3e82adf89abad963ad779f242d2d320a19f43a2d6
 SHA512 (table.tar.gz) = 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
 Size (table.tar.gz) = 4144686 bytes
+SHA1 (patch-CMakeLists.txt) = 226734589590cd9ac9c4e08de3459904d38fae98
 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) = 94b4d89ebd635726161b7743b3931d6003731c80
 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
@@ -30,9 +30,9 @@ SHA1 (patch-src_module_spell_dict_CMakeL
 SHA1 (patch-src_module_spell_dict_comp__spell__dict.c) = 5f67983a9a96f6b6f61874a32ed3e70a9c66f083
 SHA1 (patch-src_module_spell_spell-custom-dict.c) = 374e5a7498c6a620f95199cdda40be615409a4ae
 SHA1 (patch-src_module_spell_spell-custom.c) = 6b677936dfdbe687a06e30703b309faa1bf6372f
+SHA1 (patch-src_module_spell_spell.c) = 5e68ab3b1a9cab085dd79a655a43ad5abb83de8a
 SHA1 (patch-src_module_unicode_charselectdata.c) = 548f2f73f790c438ba0df234ca3990d44c01ea56
 SHA1 (patch-src_module_vk_vk.c) = cc3f2170fa3b930baea59b806b7c2c1f3319d079
 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) = ed63d58e88b4222927c05e280c21e9c9be24d1f7

Added files:

Index: pkgsrc/inputmethod/fcitx/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Sat Jun 20 09:29:04 2026
+++ pkgsrc/inputmethod/fcitx/patches/patch-CMakeLists.txt       Sat Jun 20 09:29:04 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2026/06/20 09:29:04 nia Exp $
+
+Honour the user's PKGMANDIR.
+
+--- CMakeLists.txt.orig        2026-06-20 09:24:34.879435137 +0000
++++ CMakeLists.txt
+@@ -188,7 +188,8 @@ if(NOT DEFINED MAN_INSTALL_DIR)
+     set(LIBDATA_INSTALL_DIR "${LIB_INSTALL_DIR}"  CACHE PATH "Lib data install directory [default=LIB_INSTALL_DIR]")
+ endif()
+ if(NOT DEFINED MAN_INSTALL_DIR)
+-    set(MAN_INSTALL_DIR "${prefix}/share/man"  CACHE PATH "man install directory [default=PREFIX/share/man]")
++    include(GNUInstallDirs)
++    set(MAN_INSTALL_DIR "${prefix}/${CMAKE_INSTALL_MANDIR}"  CACHE PATH "man install directory [default=PREFIX/share/man]")
+ endif()
+ if (NOT DEFINED DBUS_SERVICE_DIR)
+     set(DBUS_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/share/dbus-1/services" CACHE PATH "dbus session service directory [default=PREFIX/share/dbus-1/services]")
Index: pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell.c
diff -u /dev/null pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell.c:1.1
--- /dev/null   Sat Jun 20 09:29:04 2026
+++ pkgsrc/inputmethod/fcitx/patches/patch-src_module_spell_spell.c     Sat Jun 20 09:29:04 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_module_spell_spell.c,v 1.1 2026/06/20 09:29:04 nia Exp $
+
+Fix implicit declaration of index(3) by including the correct header.
+
+--- src/module/spell/spell.c.orig      2026-06-20 09:18:28.799075383 +0000
++++ src/module/spell/spell.c
+@@ -22,6 +22,7 @@
+ #include "config.h"
+ 
+ #include <libintl.h>
++#include <strings.h>
+ #include <errno.h>
+ 
+ #include "fcitx/ime.h"