fcitx5-5.0.21

0001-x11-xcb-imdkit-Update-to-1.0.3.patch

From 965a0e67efc564aae286d18b03c72722949bfdb5 Mon Sep 17 00:00:00 2001
From: Iku Iwasa <iku.iwasa@gmail.com>
Date: Wed, 18 Jan 2023 22:15:38 +0900
Subject: [PATCH 1/3] x11/xcb-imdkit: Update to 1.0.3

---
 x11/xcb-imdkit/Makefile | 2 +-
 x11/xcb-imdkit/distinfo | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11/xcb-imdkit/Makefile b/x11/xcb-imdkit/Makefile
index 00ffedfc959..caa2e2bf804 100644
--- a/x11/xcb-imdkit/Makefile
+++ b/x11/xcb-imdkit/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.2 2022/11/21 18:20:46 jperkin Exp $
 
-DISTNAME=	xcb-imdkit-1.0.2
+DISTNAME=	xcb-imdkit-1.0.3
 CATEGORIES=	x11
 MASTER_SITES=	https://download.fcitx-im.org/fcitx5/xcb-imdkit/
 EXTRACT_SUFX=	.tar.xz
diff --git a/x11/xcb-imdkit/distinfo b/x11/xcb-imdkit/distinfo
index e740cdd5848..c5abf436a5f 100644
--- a/x11/xcb-imdkit/distinfo
+++ b/x11/xcb-imdkit/distinfo
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.3 2021/10/26 11:34:34 nia Exp $
 
-BLAKE2s (xcb-imdkit-1.0.2.tar.xz) = 0080caedcba30404ff8829dd923b447c3cbc1340585f481e81404290c800d547
-SHA512 (xcb-imdkit-1.0.2.tar.xz) = fc34c4d021fe1e3afb0fd140849c102c2c3d3040429dfef2ffe6032c3e87b7212abcc87224a0a638bff7e5ce17c2a1e770e2e501bca7c336af16aa4f31c530b3
-Size (xcb-imdkit-1.0.2.tar.xz) = 345972 bytes
+BLAKE2s (xcb-imdkit-1.0.3.tar.xz) = 636603e554050e77ead5aac657231906a2f54f74ebb32f18868cbe957f46711f
+SHA512 (xcb-imdkit-1.0.3.tar.xz) = df15dbe8363f89259f59b4afb81befd3be88173362f78c3b6cf0c7cdb2bdca75b352b779e0e7a91bb814a6afe59c4cc8acc946ce96721ca376438a9e8f3b4e80
+Size (xcb-imdkit-1.0.3.tar.xz) = 346404 bytes
-- 
2.39.0

0002-devel-libevent-Switch-to-use-CMake.patch

From 3576a89391b7546958de3683e63aec3b4ae3b062 Mon Sep 17 00:00:00 2001
From: Iku Iwasa <iku.iwasa@gmail.com>
Date: Wed, 18 Jan 2023 22:16:28 +0900
Subject: [PATCH 2/3] devel/libevent: Switch to use CMake

---
 devel/libevent/Makefile |  3 +--
 devel/libevent/PLIST    | 37 ++++++++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index da5f1bb1ce6..3a9bb338b29 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -7,8 +7,7 @@ COMMENT=	Asynchronous event notification library
 
 CONFLICTS+=	libev<3.9nb1
 
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
+USE_CMAKE=	yes
 PKGCONFIG_OVERRIDE+=	libevent_core.pc.in
 PKGCONFIG_OVERRIDE+=	libevent_extra.pc.in
 PKGCONFIG_OVERRIDE+=	libevent_openssl.pc.in
diff --git a/devel/libevent/PLIST b/devel/libevent/PLIST
index 892b77382f3..75c144d7c08 100644
--- a/devel/libevent/PLIST
+++ b/devel/libevent/PLIST
@@ -1,4 +1,5 @@
 @comment $NetBSD: PLIST,v 1.8 2017/02/15 17:34:37 adam Exp $
+bin/event_rpcgen.py
 include/evdns.h
 include/event.h
 include/event2/buffer.h
@@ -30,11 +31,37 @@ include/event2/visibility.h
 include/evhttp.h
 include/evrpc.h
 include/evutil.h
-lib/libevent.la
-lib/libevent_core.la
-lib/libevent_extra.la
-lib/libevent_openssl.la
-lib/libevent_pthreads.la
+lib/cmake/libevent/LibeventConfig.cmake
+lib/cmake/libevent/LibeventConfigVersion.cmake
+lib/cmake/libevent/LibeventTargets-shared-release.cmake
+lib/cmake/libevent/LibeventTargets-shared.cmake
+lib/cmake/libevent/LibeventTargets-static-release.cmake
+lib/cmake/libevent/LibeventTargets-static.cmake
+lib/libevent-2.1.so
+lib/libevent-2.1.so.7
+lib/libevent-2.1.so.7.0.1
+lib/libevent.a
+lib/libevent.so
+lib/libevent_core-2.1.so
+lib/libevent_core-2.1.so.7
+lib/libevent_core-2.1.so.7.0.1
+lib/libevent_core.a
+lib/libevent_core.so
+lib/libevent_extra-2.1.so
+lib/libevent_extra-2.1.so.7
+lib/libevent_extra-2.1.so.7.0.1
+lib/libevent_extra.a
+lib/libevent_extra.so
+lib/libevent_openssl-2.1.so
+lib/libevent_openssl-2.1.so.7
+lib/libevent_openssl-2.1.so.7.0.1
+lib/libevent_openssl.a
+lib/libevent_openssl.so
+lib/libevent_pthreads-2.1.so
+lib/libevent_pthreads-2.1.so.7
+lib/libevent_pthreads-2.1.so.7.0.1
+lib/libevent_pthreads.a
+lib/libevent_pthreads.so
 lib/pkgconfig/libevent.pc
 lib/pkgconfig/libevent_core.pc
 lib/pkgconfig/libevent_extra.pc
-- 
2.39.0

0003-inputmethod-fcitx5-Update-to-5.0.21.patch

From 03e0c29e3ae3c1b1157d71aa96e871b53ed9e552 Mon Sep 17 00:00:00 2001
From: Iku Iwasa <iku.iwasa@gmail.com>
Date: Wed, 18 Jan 2023 22:17:47 +0900
Subject: [PATCH 3/3] inputmethod/fcitx5: Update to 5.0.21

---
 inputmethod/fcitx5/Makefile                   |   6 +-
 inputmethod/fcitx5/PLIST                      | 180 ++++++++++++++++--
 inputmethod/fcitx5/distinfo                   |  11 +-
 .../patch-src_lib_fcitx-utils_misc.cpp        |  16 --
 .../patch-src_lib_fcitx-utils_uuid__p.h       |  13 ++
 .../patch-src_lib_fcitx_inputcontext__p.h     |  17 --
 ...=> patch-src_modules_spell_CMakeLists.txt} |  10 +-
 7 files changed, 186 insertions(+), 67 deletions(-)
 delete mode 100644 inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_misc.cpp
 create mode 100644 inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h
 delete mode 100644 inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h
 rename inputmethod/fcitx5/patches/{patch-src_modules_spell_dict_CMakeLists.txt => patch-src_modules_spell_CMakeLists.txt} (58%)

diff --git a/inputmethod/fcitx5/Makefile b/inputmethod/fcitx5/Makefile
index 2f767204094..1421d04cdaf 100644
--- a/inputmethod/fcitx5/Makefile
+++ b/inputmethod/fcitx5/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2023/01/03 17:37:37 wiz Exp $
+# $NetBSD$
 
-DISTNAME=	fcitx5-5.0.5
+DISTNAME=	fcitx5-5.0.21
 PKGREVISION=	4
 CATEGORIES=	inputmethod
 MASTER_SITES=	https://download.fcitx-im.org/fcitx5/fcitx5/
@@ -62,7 +62,7 @@ CONF_FILES+=	${PREFIX}/share/examples/fcitx5/org.fcitx.Fcitx5.desktop	\
 		${PKG_SYSCONFDIR}/xdg/autostart/org.fcitx.Fcitx5.desktop
 
 pre-configure:
-	${LN} -s ${DISTDIR}/en_dict-20121020.tar.gz \
+	${LN} -hfs ${DISTDIR}/en_dict-20121020.tar.gz \
 		${WRKSRC}/src/modules/spell/dict
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/inputmethod/fcitx5/PLIST b/inputmethod/fcitx5/PLIST
index 75a9572274a..36290663b63 100644
--- a/inputmethod/fcitx5/PLIST
+++ b/inputmethod/fcitx5/PLIST
@@ -50,6 +50,7 @@ include/Fcitx5/Module/fcitx-module/quickphrase/quickphrase_public.h
 include/Fcitx5/Module/fcitx-module/spell/spell_public.h
 include/Fcitx5/Module/fcitx-module/testfrontend/testfrontend_public.h
 include/Fcitx5/Module/fcitx-module/testim/testim_public.h
+include/Fcitx5/Module/fcitx-module/unicode/unicode_public.h
 include/Fcitx5/Module/fcitx-module/xcb/xcb_public.h
 include/Fcitx5/Utils/fcitx-utils/capabilityflags.h
 include/Fcitx5/Utils/fcitx-utils/charutils.h
@@ -83,6 +84,7 @@ include/Fcitx5/Utils/fcitx-utils/macros.h
 include/Fcitx5/Utils/fcitx-utils/metastring.h
 include/Fcitx5/Utils/fcitx-utils/misc.h
 include/Fcitx5/Utils/fcitx-utils/rect.h
+include/Fcitx5/Utils/fcitx-utils/semver.h
 include/Fcitx5/Utils/fcitx-utils/signals.h
 include/Fcitx5/Utils/fcitx-utils/signals_details.h
 include/Fcitx5/Utils/fcitx-utils/standardpath.h
@@ -122,6 +124,8 @@ lib/cmake/Fcitx5ModuleTestFrontend/Fcitx5ModuleTestFrontendConfig.cmake
 lib/cmake/Fcitx5ModuleTestFrontend/Fcitx5ModuleTestFrontendConfigVersion.cmake
 lib/cmake/Fcitx5ModuleTestIM/Fcitx5ModuleTestIMConfig.cmake
 lib/cmake/Fcitx5ModuleTestIM/Fcitx5ModuleTestIMConfigVersion.cmake
+lib/cmake/Fcitx5ModuleUnicode/Fcitx5ModuleUnicodeConfig.cmake
+lib/cmake/Fcitx5ModuleUnicode/Fcitx5ModuleUnicodeConfigVersion.cmake
 lib/cmake/Fcitx5ModuleXCB/Fcitx5ModuleXCBConfig.cmake
 lib/cmake/Fcitx5ModuleXCB/Fcitx5ModuleXCBConfigVersion.cmake
 lib/cmake/Fcitx5Utils/Fcitx5CompilerSettings.cmake
@@ -132,26 +136,26 @@ lib/cmake/Fcitx5Utils/Fcitx5UtilsConfig.cmake
 lib/cmake/Fcitx5Utils/Fcitx5UtilsConfigVersion.cmake
 lib/cmake/Fcitx5Utils/Fcitx5UtilsTargets-noconfig.cmake
 lib/cmake/Fcitx5Utils/Fcitx5UtilsTargets.cmake
-lib/fcitx5/classicui.so
-lib/fcitx5/clipboard.so
-lib/fcitx5/dbus.so
-lib/fcitx5/dbusfrontend.so
-lib/fcitx5/emoji.so
-lib/fcitx5/fcitx4frontend.so
-lib/fcitx5/ibusfrontend.so
-lib/fcitx5/imselector.so
-lib/fcitx5/kimpanel.so
+lib/fcitx5/libclassicui.so
+lib/fcitx5/libclipboard.so
+lib/fcitx5/libdbus.so
+lib/fcitx5/libdbusfrontend.so
+lib/fcitx5/libemoji.so
 lib/fcitx5/libexec/comp-spell-dict
-lib/fcitx5/notificationitem.so
-lib/fcitx5/notifications.so
-lib/fcitx5/quickphrase.so
-lib/fcitx5/spell.so
-lib/fcitx5/testfrontend.so
-lib/fcitx5/testim.so
-lib/fcitx5/testui.so
-lib/fcitx5/unicode.so
-lib/fcitx5/xcb.so
-lib/fcitx5/xim.so
+lib/fcitx5/libfcitx4frontend.so
+lib/fcitx5/libibusfrontend.so
+lib/fcitx5/libimselector.so
+lib/fcitx5/libkimpanel.so
+lib/fcitx5/libnotificationitem.so
+lib/fcitx5/libnotifications.so
+lib/fcitx5/libquickphrase.so
+lib/fcitx5/libspell.so
+lib/fcitx5/libtestfrontend.so
+lib/fcitx5/libtestim.so
+lib/fcitx5/libtestui.so
+lib/fcitx5/libunicode.so
+lib/fcitx5/libxcb.so
+lib/fcitx5/libxim.so
 lib/libFcitx5Config.so
 lib/libFcitx5Config.so.${PKGVERSION}
 lib/libFcitx5Config.so.6
@@ -165,6 +169,7 @@ lib/pkgconfig/Fcitx5Config.pc
 lib/pkgconfig/Fcitx5Core.pc
 lib/pkgconfig/Fcitx5Module.pc
 lib/pkgconfig/Fcitx5Utils.pc
+libexec/fcitx5-wayland-launcher
 share/applications/fcitx5-configtool.desktop
 share/applications/org.fcitx.Fcitx5.desktop
 share/dbus-1/services/org.fcitx.Fcitx5.service
@@ -238,6 +243,142 @@ share/fcitx5/default/ur_IN
 share/fcitx5/default/zh_CN
 share/fcitx5/default/zh_HK
 share/fcitx5/default/zh_TW
+share/fcitx5/emoji/data/af.dict
+share/fcitx5/emoji/data/am.dict
+share/fcitx5/emoji/data/ar.dict
+share/fcitx5/emoji/data/ar_SA.dict
+share/fcitx5/emoji/data/as.dict
+share/fcitx5/emoji/data/ast.dict
+share/fcitx5/emoji/data/az.dict
+share/fcitx5/emoji/data/be.dict
+share/fcitx5/emoji/data/bg.dict
+share/fcitx5/emoji/data/bn.dict
+share/fcitx5/emoji/data/br.dict
+share/fcitx5/emoji/data/bs.dict
+share/fcitx5/emoji/data/ca.dict
+share/fcitx5/emoji/data/ccp.dict
+share/fcitx5/emoji/data/ceb.dict
+share/fcitx5/emoji/data/chr.dict
+share/fcitx5/emoji/data/ckb.dict
+share/fcitx5/emoji/data/cs.dict
+share/fcitx5/emoji/data/cy.dict
+share/fcitx5/emoji/data/da.dict
+share/fcitx5/emoji/data/de.dict
+share/fcitx5/emoji/data/de_CH.dict
+share/fcitx5/emoji/data/dsb.dict
+share/fcitx5/emoji/data/el.dict
+share/fcitx5/emoji/data/en.dict
+share/fcitx5/emoji/data/en_001.dict
+share/fcitx5/emoji/data/en_AU.dict
+share/fcitx5/emoji/data/en_CA.dict
+share/fcitx5/emoji/data/en_GB.dict
+share/fcitx5/emoji/data/es.dict
+share/fcitx5/emoji/data/es_419.dict
+share/fcitx5/emoji/data/es_MX.dict
+share/fcitx5/emoji/data/es_US.dict
+share/fcitx5/emoji/data/et.dict
+share/fcitx5/emoji/data/eu.dict
+share/fcitx5/emoji/data/fa.dict
+share/fcitx5/emoji/data/fi.dict
+share/fcitx5/emoji/data/fil.dict
+share/fcitx5/emoji/data/fo.dict
+share/fcitx5/emoji/data/fr.dict
+share/fcitx5/emoji/data/fr_CA.dict
+share/fcitx5/emoji/data/ga.dict
+share/fcitx5/emoji/data/gd.dict
+share/fcitx5/emoji/data/gl.dict
+share/fcitx5/emoji/data/gu.dict
+share/fcitx5/emoji/data/ha.dict
+share/fcitx5/emoji/data/he.dict
+share/fcitx5/emoji/data/hi.dict
+share/fcitx5/emoji/data/hi_Latn.dict
+share/fcitx5/emoji/data/hr.dict
+share/fcitx5/emoji/data/hsb.dict
+share/fcitx5/emoji/data/hu.dict
+share/fcitx5/emoji/data/hy.dict
+share/fcitx5/emoji/data/ia.dict
+share/fcitx5/emoji/data/id.dict
+share/fcitx5/emoji/data/ig.dict
+share/fcitx5/emoji/data/is.dict
+share/fcitx5/emoji/data/it.dict
+share/fcitx5/emoji/data/ja.dict
+share/fcitx5/emoji/data/jv.dict
+share/fcitx5/emoji/data/ka.dict
+share/fcitx5/emoji/data/kab.dict
+share/fcitx5/emoji/data/kk.dict
+share/fcitx5/emoji/data/kl.dict
+share/fcitx5/emoji/data/km.dict
+share/fcitx5/emoji/data/kn.dict
+share/fcitx5/emoji/data/ko.dict
+share/fcitx5/emoji/data/kok.dict
+share/fcitx5/emoji/data/ky.dict
+share/fcitx5/emoji/data/lb.dict
+share/fcitx5/emoji/data/lo.dict
+share/fcitx5/emoji/data/lt.dict
+share/fcitx5/emoji/data/lv.dict
+share/fcitx5/emoji/data/mi.dict
+share/fcitx5/emoji/data/mk.dict
+share/fcitx5/emoji/data/ml.dict
+share/fcitx5/emoji/data/mn.dict
+share/fcitx5/emoji/data/mni.dict
+share/fcitx5/emoji/data/mr.dict
+share/fcitx5/emoji/data/ms.dict
+share/fcitx5/emoji/data/mt.dict
+share/fcitx5/emoji/data/my.dict
+share/fcitx5/emoji/data/ne.dict
+share/fcitx5/emoji/data/nl.dict
+share/fcitx5/emoji/data/nn.dict
+share/fcitx5/emoji/data/no.dict
+share/fcitx5/emoji/data/or.dict
+share/fcitx5/emoji/data/pa.dict
+share/fcitx5/emoji/data/pa_Arab.dict
+share/fcitx5/emoji/data/pcm.dict
+share/fcitx5/emoji/data/pl.dict
+share/fcitx5/emoji/data/ps.dict
+share/fcitx5/emoji/data/pt.dict
+share/fcitx5/emoji/data/pt_PT.dict
+share/fcitx5/emoji/data/qu.dict
+share/fcitx5/emoji/data/rm.dict
+share/fcitx5/emoji/data/ro.dict
+share/fcitx5/emoji/data/ru.dict
+share/fcitx5/emoji/data/rw.dict
+share/fcitx5/emoji/data/sc.dict
+share/fcitx5/emoji/data/sd.dict
+share/fcitx5/emoji/data/si.dict
+share/fcitx5/emoji/data/sk.dict
+share/fcitx5/emoji/data/sl.dict
+share/fcitx5/emoji/data/so.dict
+share/fcitx5/emoji/data/sq.dict
+share/fcitx5/emoji/data/sr.dict
+share/fcitx5/emoji/data/sr_Cyrl_BA.dict
+share/fcitx5/emoji/data/sr_Latn.dict
+share/fcitx5/emoji/data/sr_Latn_BA.dict
+share/fcitx5/emoji/data/sv.dict
+share/fcitx5/emoji/data/sw.dict
+share/fcitx5/emoji/data/sw_KE.dict
+share/fcitx5/emoji/data/ta.dict
+share/fcitx5/emoji/data/te.dict
+share/fcitx5/emoji/data/tg.dict
+share/fcitx5/emoji/data/th.dict
+share/fcitx5/emoji/data/ti.dict
+share/fcitx5/emoji/data/tk.dict
+share/fcitx5/emoji/data/to.dict
+share/fcitx5/emoji/data/tr.dict
+share/fcitx5/emoji/data/ug.dict
+share/fcitx5/emoji/data/uk.dict
+share/fcitx5/emoji/data/ur.dict
+share/fcitx5/emoji/data/uz.dict
+share/fcitx5/emoji/data/vi.dict
+share/fcitx5/emoji/data/wo.dict
+share/fcitx5/emoji/data/xh.dict
+share/fcitx5/emoji/data/yo.dict
+share/fcitx5/emoji/data/yo_BJ.dict
+share/fcitx5/emoji/data/yue.dict
+share/fcitx5/emoji/data/yue_Hans.dict
+share/fcitx5/emoji/data/zh.dict
+share/fcitx5/emoji/data/zh_Hant.dict
+share/fcitx5/emoji/data/zh_Hant_HK.dict
+share/fcitx5/emoji/data/zu.dict
 share/fcitx5/spell/en_dict.fscd
 share/fcitx5/testing/addon/testfrontend.conf
 share/fcitx5/testing/addon/testim.conf
@@ -273,6 +414,7 @@ share/locale/he/LC_MESSAGES/fcitx5.mo
 share/locale/ja/LC_MESSAGES/fcitx5.mo
 share/locale/ko/LC_MESSAGES/fcitx5.mo
 share/locale/ru/LC_MESSAGES/fcitx5.mo
+share/locale/vi/LC_MESSAGES/fcitx5.mo
 share/locale/zh_CN/LC_MESSAGES/fcitx5.mo
 share/locale/zh_TW/LC_MESSAGES/fcitx5.mo
 share/metainfo/org.fcitx.Fcitx5.metainfo.xml
diff --git a/inputmethod/fcitx5/distinfo b/inputmethod/fcitx5/distinfo
index 8bde7613c4b..67825d803ce 100644
--- a/inputmethod/fcitx5/distinfo
+++ b/inputmethod/fcitx5/distinfo
@@ -3,13 +3,12 @@ $NetBSD: distinfo,v 1.7 2022/12/18 11:41:39 nros Exp $
 BLAKE2s (en_dict-20121020.tar.gz) = 9945545f2402d0eb35bd46701e51f191da0b740854d0c8da11d7670aa1ad014f
 SHA512 (en_dict-20121020.tar.gz) = 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
 Size (en_dict-20121020.tar.gz) = 630491 bytes
-BLAKE2s (fcitx5-5.0.5.tar.xz) = c4265cf8b03f0a1629355052808942be464f5e49fefa8e497296f889367b973a
-SHA512 (fcitx5-5.0.5.tar.xz) = 3bc1a51119c9ee0c62a7112b520f88bdc6afe10b6a7d61c97d4b7b69556716a15815b9523eb9aa566918217ad299285116a60a60978cd8297225e6f4b856785a
-Size (fcitx5-5.0.5.tar.xz) = 1294560 bytes
+BLAKE2s (fcitx5-5.0.21.tar.xz) = 847f2739ca9cc5b67c98c22063fd5aeaff1bc0f547f3c7aa6d461d7ef6e3eda6
+SHA512 (fcitx5-5.0.21.tar.xz) = 5a7c8dbed7a1e898c18cfa8c7e7b81cec3c330f5b65e212c6e5523cafe28b8edf69d6b293d3792be9dca9cee233a7c0a639bae6c04eb414a80731455bb70b066
+Size (fcitx5-5.0.21.tar.xz) = 6811828 bytes
 SHA1 (patch-src_frontend_ibusfrontend_ibusfrontend.cpp) = 06d009f2d3977f5f72ca727a41e6aeb15aa257a2
 SHA1 (patch-src_lib_fcitx-utils_endian__p.h) = dfc1ec5fdfacc589b2b0755066e8d3bc22419eb4
 SHA1 (patch-src_lib_fcitx-utils_library.cpp) = 89f5a45336823057fcaedb0b3dac5b546e15c537
-SHA1 (patch-src_lib_fcitx-utils_misc.cpp) = 3f7b13bea6fba8d59935465b3ede3732b1571c26
-SHA1 (patch-src_lib_fcitx_inputcontext__p.h) = 11c753f699ad1068e315797911864279b924e231
-SHA1 (patch-src_modules_spell_dict_CMakeLists.txt) = 3bbb67be4209af3d0cc50687c1f1be2ab8757c66
+SHA1 (patch-src_lib_fcitx-utils_uuid__p.h) = c709b53a405f3b19163e2d341e71465547972ef4
+SHA1 (patch-src_modules_spell_CMakeLists.txt) = 8e7ef61d982be4aa0854e4abf0ea0d2a91e5123d
 SHA1 (patch-test_testdbus.cpp) = e20ca569ec6e79a7565471ebccd5fa54de645462
diff --git a/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_misc.cpp b/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_misc.cpp
deleted file mode 100644
index f7c0eb5c15e..00000000000
--- a/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_misc.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_lib_fcitx-utils_misc.cpp,v 1.1 2021/02/17 15:16:25 ryoon Exp $
-
-* NetBSD has no sys/user.h.
-
---- src/lib/fcitx-utils/misc.cpp.orig	2020-12-25 17:51:34.717115200 +0000
-+++ src/lib/fcitx-utils/misc.cpp
-@@ -16,7 +16,9 @@
- #include <kvm.h>
- #include <sys/param.h>
- #include <sys/sysctl.h>
-+#if !defined(__NetBSD__)
- #include <sys/user.h>
-+#endif
- #elif defined(__APPLE__)
- #include <libproc.h>
- #endif
diff --git a/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h b/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h
new file mode 100644
index 00000000000..4dfe31b7815
--- /dev/null
+++ b/inputmethod/fcitx5/patches/patch-src_lib_fcitx-utils_uuid__p.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/lib/fcitx-utils/uuid_p.h.orig	2021-03-14 16:01:40.698618400 +0000
++++ src/lib/fcitx-utils/uuid_p.h
+@@ -21,7 +21,7 @@
+ #endif
+ 
+ #ifdef ENABLE_LIBUUID
+-#include <uuid.h>
++#include <uuid/uuid.h>
+ #endif
+ 
+ namespace fcitx {
diff --git a/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h b/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h
deleted file mode 100644
index a0ad7b4ed7e..00000000000
--- a/inputmethod/fcitx5/patches/patch-src_lib_fcitx_inputcontext__p.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_lib_fcitx_inputcontext__p.h,v 1.1 2022/12/18 11:41:39 nros Exp $
-
-Make sure uuiod.h from libuuid is included, when using <uuid.h>
-the risk is that uuid.h from /usr/include gets included on BSD
-systems and it does not have uuid_generate causeing build failure.
-
---- src/lib/fcitx/inputcontext_p.h.orig	2022-12-18 11:28:32.792366572 +0000
-+++ src/lib/fcitx/inputcontext_p.h
-@@ -15,7 +15,7 @@
- #include <fcitx/inputpanel.h>
- #include <fcitx/instance.h>
- #include <fcitx/statusarea.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
- 
- namespace fcitx {
- 
diff --git a/inputmethod/fcitx5/patches/patch-src_modules_spell_dict_CMakeLists.txt b/inputmethod/fcitx5/patches/patch-src_modules_spell_CMakeLists.txt
similarity index 58%
rename from inputmethod/fcitx5/patches/patch-src_modules_spell_dict_CMakeLists.txt
rename to inputmethod/fcitx5/patches/patch-src_modules_spell_CMakeLists.txt
index 24ea2289bd8..a259d51e819 100644
--- a/inputmethod/fcitx5/patches/patch-src_modules_spell_dict_CMakeLists.txt
+++ b/inputmethod/fcitx5/patches/patch-src_modules_spell_CMakeLists.txt
@@ -1,10 +1,8 @@
-$NetBSD: patch-src_modules_spell_dict_CMakeLists.txt,v 1.1 2021/02/17 15:16:25 ryoon Exp $
+$NetBSD$
 
-* pkgsrc drops $ORIGIN and use LD_LIBRARY_PATH to run tool during build.
-
---- src/modules/spell/dict/CMakeLists.txt.orig	2019-08-26 01:11:04.000000000 +0000
-+++ src/modules/spell/dict/CMakeLists.txt
-@@ -23,7 +23,7 @@ fcitx5_extract(spell-en-extract "${SPELL
+--- src/modules/spell/CMakeLists.txt.orig	2022-07-13 15:35:52.686267900 +0000
++++ src/modules/spell/CMakeLists.txt
+@@ -42,7 +42,7 @@ fcitx5_extract(spell-en-extract "${SPELL
  add_custom_command(
    OUTPUT "${SPELL_EN_DICT}"
    DEPENDS "${SPELL_EN_DICT_SRC}" Fcitx5::comp-spell-dict spell-en-extract
-- 
2.39.0