On 24/12/23 01:51PM, Stuart Henderson wrote:
> On 2024/12/23 05:37, Yifei Zhan wrote:
> > On 24/12/22 11:28PM, Yifei Zhan wrote:
> > > On 24/12/22 03:33AM, Yifei Zhan wrote:
> > > > Here is another wave of opencc and fcitx-* updates.
> > > >
> > >
> > > The patch attached to the last email contains a few mistakes due to a
> > > merge error from my workflow, a new patch is being prepared.
> > >
> > > Thanks Brad Smith for noticing this and sorry for the noise.
> > >
> >
> > New patch, this should apply properly now. ;)
>
> This patch adds DIST_SUBDIR to some ports and removes it from others,
> could you make them consistent please? (It doesn't matter too much
> which way, but my personal preference is to avoid DIST_SUBDIR unless
> the filenames don't include versions and result in conflicts).
New patch attached, thanks for noticing that. My goal is to get rid of alL
the DIST_SUBDIR but some got mixed in during another merging process.
diff --git converters/opencc/Makefile converters/opencc/Makefile
index e3d75a85603..c071b43ce62 100644
--- converters/opencc/Makefile
+++ converters/opencc/Makefile
@@ -1,8 +1,7 @@
COMMENT = convert between traditional and simplified Chinese
-V = 1.1.7
+V = 1.1.9
DISTNAME = opencc-$V
-REVISION = 0
GH_ACCOUNT = BYVoid
GH_PROJECT = OpenCC
diff --git converters/opencc/distinfo converters/opencc/distinfo
index 3d93967b1d2..568b27bd9ce 100644
--- converters/opencc/distinfo
+++ converters/opencc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opencc-1.1.7.tar.gz) = gKEmdQlKDKyQ5w7lMOk23HbKCVPLBEP3KDwrVYY15P4=
-SIZE (opencc-1.1.7.tar.gz) = 3311712
+SHA256 (opencc-1.1.9.tar.gz) = rUvNjYchmiQKI21KVcnezSEyqUNml9KILq2FyJObCpk=
+SIZE (opencc-1.1.9.tar.gz) = 3422511
diff --git inputmethods/fcitx-anthy/Makefile inputmethods/fcitx-anthy/Makefile
index db4175c22bf..b2bcbeefe9e 100644
--- inputmethods/fcitx-anthy/Makefile
+++ inputmethods/fcitx-anthy/Makefile
@@ -1,12 +1,7 @@
COMMENT = anthy wrapper for fcitx5
-V = 5.0.14
-PKGNAME = fcitx-anthy-$V
-REVISION = 0
-
-GH_ACCOUNT = fcitx
-GH_PROJECT = fcitx5-anthy
-GH_TAGNAME = $V
+DISTNAME = fcitx5-anthy-5.1.5
+PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods japanese
@@ -20,6 +15,9 @@ WANTLIB += anthy anthydic m
# LGPL-2.1+
PERMIT_PACKAGE= Yes
+SITES = https://download.fcitx-im.org/fcitx5/fcitx5-anthy/
+EXTRACT_SUFX = .tar.zst
+
MODULES = devel/kf5
MODQT5_DEPS = No
diff --git inputmethods/fcitx-anthy/distinfo inputmethods/fcitx-anthy/distinfo
index 0a6d87d8a5a..827cddf2338 100644
--- inputmethods/fcitx-anthy/distinfo
+++ inputmethods/fcitx-anthy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-anthy-5.0.14.tar.gz) =
rOCKrrZFLkxDbW7vq0SHdUMIaLcm6U2nauLC+16w0yQ=
-SIZE (fcitx5-anthy-5.0.14.tar.gz) = 104560
+SHA256 (fcitx5-anthy-5.1.5.tar.zst) =
heSO2eArdSnOmIg7JG8vOo5y3g5dSPOuXkUfeNqKzSA=
+SIZE (fcitx5-anthy-5.1.5.tar.zst) = 111947
diff --git inputmethods/fcitx-anthy/pkg/PLIST inputmethods/fcitx-anthy/pkg/PLIST
index 2990771f8d0..51898a5fa55 100644
--- inputmethods/fcitx-anthy/pkg/PLIST
+++ inputmethods/fcitx-anthy/pkg/PLIST
@@ -1,4 +1,4 @@
-@so lib/fcitx5/anthy.so
+@so lib/fcitx5/libanthy.so
share/fcitx5/addon/anthy.conf
share/fcitx5/anthy/
share/fcitx5/anthy/101kana.sty
diff --git inputmethods/fcitx-chewing/Makefile
inputmethods/fcitx-chewing/Makefile
index 7b3ec096711..f7c04a37029 100644
--- inputmethods/fcitx-chewing/Makefile
+++ inputmethods/fcitx-chewing/Makefile
@@ -1,12 +1,7 @@
COMMENT = chewing wrapper for fcitx5
-V = 5.1.1
-PKGNAME = fcitx-chewing-$V
-
-GH_ACCOUNT = fcitx
-GH_PROJECT = fcitx5-chewing
-GH_TAGNAME = $V
-
+DISTNAME = fcitx5-chewing-5.1.6
+PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods chinese
HOMEPAGE = https://github.com/fcitx/fcitx5-chewing
@@ -19,6 +14,9 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
WANTLIB += chewing m
+SITES = https://download.fcitx-im.org/fcitx5/fcitx5-chewing/
+EXTRACT_SUFX = .tar.zst
+
MODULES = devel/kf5
MODQT5_DEPS = No
@@ -33,7 +31,4 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = inputmethods/fcitx \
chinese/libchewing
-# ninja: error: unknown target 'test'
-NO_TEST = Yes
-
.include <bsd.port.mk>
diff --git inputmethods/fcitx-chewing/distinfo
inputmethods/fcitx-chewing/distinfo
index e39b8162992..e2e6c9e0e47 100644
--- inputmethods/fcitx-chewing/distinfo
+++ inputmethods/fcitx-chewing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-chewing-5.1.1.tar.gz) =
PyQD7xc6Y6EC2GhlWcoVAfNqnYak0qlqUAIbv7b44qY=
-SIZE (fcitx5-chewing-5.1.1.tar.gz) = 26454
+SHA256 (fcitx5-chewing-5.1.6.tar.zst) =
sWnvJemeLkMCD7ZtHyK+JKh5PpAyFE6iWS2IWxjWQMk=
+SIZE (fcitx5-chewing-5.1.6.tar.zst) = 34497
diff --git inputmethods/fcitx-chinese-addons/Makefile
inputmethods/fcitx-chinese-addons/Makefile
index 4a61120a17d..ce8b26a9da6 100644
--- inputmethods/fcitx-chinese-addons/Makefile
+++ inputmethods/fcitx-chinese-addons/Makefile
@@ -1,7 +1,6 @@
COMMENT = addons related to Chinese with IME bundled inside fcitx
-V = 5.1.3
-DISTNAME = fcitx5-chinese-addons-$V
+DISTNAME = fcitx5-chinese-addons-5.1.7
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods chinese
@@ -13,13 +12,13 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
# LGPLv2.1+
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core
-WANTLIB += Fcitx5Qt5WidgetsAddons Fcitx5Utils IMECore IMEPinyin
-WANTLIB += IMETable Qt5Concurrent Qt5Core Qt5Gui Qt5Widgets
-WANTLIB += boost_iostreams-mt boost_regex-mt c m opencc
+WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt6WidgetsAddons
+WANTLIB += Fcitx5Utils GL IMECore IMEPinyin IMETable Qt6Concurrent
+WANTLIB += Qt6Core Qt6Gui Qt6Widgets boost_container-mt boost_iostreams-mt
+WANTLIB += boost_json-mt boost_regex-mt c m opencc
SITES =
https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/
-DIST_SUBDIR = fcitx
+EXTRACT_SUFX = .tar.zst
SITES.py = https://download.fcitx-im.org/data/
DISTFILES.py += py_table-20121124.tar.gz
@@ -48,8 +47,7 @@ CONFIGURE_ARGS = -DENABLE_BROWSER=OFF \
post-patch:
cp ${FULLDISTDIR}/py_table-20121124.tar.gz \
- ${WRKSRC}/modules/pinyinhelper/
- cp ${FULLDISTDIR}/py_stroke-20121124.tar.gz \
- ${WRKSRC}/modules/pinyinhelper/
+ ${FULLDISTDIR}/py_stroke-20121124.tar.gz \
+ ${WRKSRC}/modules/pinyinhelper/
.include <bsd.port.mk>
diff --git inputmethods/fcitx-chinese-addons/distinfo
inputmethods/fcitx-chinese-addons/distinfo
index 8bef60035ff..6f4296fa089 100644
--- inputmethods/fcitx-chinese-addons/distinfo
+++ inputmethods/fcitx-chinese-addons/distinfo
@@ -1,6 +1,6 @@
-SHA256 (fcitx/fcitx5-chinese-addons-5.1.3.tar.xz) =
a6eicKSHxPoRKTO0l0//ey/vIV3FQJvSNl6jt2Gjgi0=
-SHA256 (fcitx/py_stroke-20121124.tar.gz) =
jrEoqb+kOVLmfPL87h/RNMb0z9MXvC9sOKYV9etk4kg=
-SHA256 (fcitx/py_table-20121124.tar.gz) =
QhRqyX3mwT1V+eme2HORX0xmc56cEVMqNFVrrfl5LAQ=
-SIZE (fcitx/fcitx5-chinese-addons-5.1.3.tar.xz) = 252016
-SIZE (fcitx/py_stroke-20121124.tar.gz) = 445601
-SIZE (fcitx/py_table-20121124.tar.gz) = 186822
+SHA256 (fcitx5-chinese-addons-5.1.7.tar.zst) =
8MH0HqAwa1+SsaYIjM1AmczBwhcF/oNqT/gtvkP3QMI=
+SHA256 (py_stroke-20121124.tar.gz) =
jrEoqb+kOVLmfPL87h/RNMb0z9MXvC9sOKYV9etk4kg=
+SHA256 (py_table-20121124.tar.gz) =
QhRqyX3mwT1V+eme2HORX0xmc56cEVMqNFVrrfl5LAQ=
+SIZE (fcitx5-chinese-addons-5.1.7.tar.zst) = 372001
+SIZE (py_stroke-20121124.tar.gz) = 445601
+SIZE (py_table-20121124.tar.gz) = 186822
diff --git inputmethods/fcitx-chinese-addons/pkg/PLIST
inputmethods/fcitx-chinese-addons/pkg/PLIST
index d12f460ea18..3051e8ff0d0 100644
--- inputmethods/fcitx-chinese-addons/pkg/PLIST
+++ inputmethods/fcitx-chinese-addons/pkg/PLIST
@@ -15,9 +15,8 @@
lib/cmake/Fcitx5ModulePunctuation/Fcitx5ModulePunctuationConfigVersion.cmake
@so lib/fcitx5/libpinyinhelper.so
@so lib/fcitx5/libpunctuation.so
@so lib/fcitx5/libtable.so
-lib/fcitx5/qt5/
-@so lib/fcitx5/qt5/libcustomphraseeditor.so
-@so lib/fcitx5/qt5/libpinyindictmanager.so
+@so lib/fcitx5/qt6/libcustomphraseeditor.so
+@so lib/fcitx5/qt6/libpinyindictmanager.so
share/fcitx5/addon/chttrans.conf
share/fcitx5/addon/fullwidth.conf
share/fcitx5/addon/pinyin.conf
@@ -41,7 +40,7 @@ share/fcitx5/lua/imeapi/extensions/
share/fcitx5/lua/imeapi/extensions/pinyin.lua
share/fcitx5/pinyin/
share/fcitx5/pinyin/chaizi.dict
-share/fcitx5/pinyin/emoji.dict
+share/fcitx5/pinyin/symbols
share/fcitx5/pinyinhelper/
share/fcitx5/pinyinhelper/py_stroke.mb
share/fcitx5/pinyinhelper/py_table.mb
diff --git inputmethods/fcitx-config-qt/Makefile
inputmethods/fcitx-config-qt/Makefile
index d4a4be52c94..ae36b1e3a84 100644
--- inputmethods/fcitx-config-qt/Makefile
+++ inputmethods/fcitx-config-qt/Makefile
@@ -1,8 +1,7 @@
COMMENT = GUI configure tool for fcitx5
-V = 5.1.3
-DISTNAME = fcitx5-configtool-$V
-PKGNAME = fcitx-configtool-qt-$V
+DISTNAME = fcitx5-configtool-5.1.7
+PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods
@@ -13,15 +12,15 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
# GPLv2.0+
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt5DBusAddons
-WANTLIB += Fcitx5Qt5WidgetsAddons Fcitx5Utils KF5ConfigCore KF5CoreAddons
-WANTLIB += KF5I18n KF5IconThemes KF5ItemViews KF5Package KF5Plasma
-WANTLIB += KF5QuickAddons KF5Service KF5WidgetsAddons KF5Declarative
-WANTLIB += Qt5DBus Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5Core
-WANTLIB += Qt5Widgets Qt5X11Extras X11 c m xkbcommon xkbfile
+WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt6DBusAddons
+WANTLIB += Fcitx5Qt6WidgetsAddons Fcitx5Utils GL KF6ConfigCore
+WANTLIB += KF6CoreAddons KF6I18n KF6IconThemes KF6ItemViews KF6KCMUtilsCore
+WANTLIB += KF6KCMUtilsQuick KF6Svg KF6WidgetsAddons Plasma Qt6Core
+WANTLIB += Qt6DBus Qt6Gui Qt6Network Qt6OpenGL Qt6Qml Qt6QmlModels
+WANTLIB += Qt6Quick Qt6Widgets X11 c m xkbcommon xkbfile
SITES =
https://download.fcitx-im.org/fcitx5/fcitx5-configtool/
-DIST_SUBDIR = fcitx
+EXTRACT_SUFX = .tar.zst
MODULES = devel/kf5
@@ -36,7 +35,16 @@ RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx-qt \
+ x11/kde-plasma/libplasma \
x11/qt5/qtx11extras \
+ devel/kf6/kdeclarative \
+ devel/kf6/kconfig \
+ devel/kf6/kwidgetsaddons \
+ devel/kf6/kcmutils \
+ devel/kf6/kcoreaddons \
+ devel/kf6/ki18n \
+ devel/kf6/ksvg \
+ devel/kf6/kitemviews \
devel/kf5/plasma-framework \
devel/kf5/kdeclarative \
devel/kf5/ki18n \
diff --git inputmethods/fcitx-config-qt/distinfo
inputmethods/fcitx-config-qt/distinfo
index acee8734a6d..c293d67c646 100644
--- inputmethods/fcitx-config-qt/distinfo
+++ inputmethods/fcitx-config-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx5-configtool-5.1.3.tar.xz) =
H+7zGxuw+JAWhFohfl9Wsma4bBpEtO1kC0nBN43M3N4=
-SIZE (fcitx/fcitx5-configtool-5.1.3.tar.xz) = 110124
+SHA256 (fcitx5-configtool-5.1.7.tar.zst) =
NfPa8sigzrEmbP5aElCGd3WYa/3RjvzmpseSuUOfbdE=
+SIZE (fcitx5-configtool-5.1.7.tar.zst) = 149763
diff --git inputmethods/fcitx-config-qt/pkg/PLIST
inputmethods/fcitx-config-qt/pkg/PLIST
index 9171fe51181..e8b90f2d63a 100644
--- inputmethods/fcitx-config-qt/pkg/PLIST
+++ inputmethods/fcitx-config-qt/pkg/PLIST
@@ -1,35 +1,13 @@
@bin bin/fcitx5-config-qt
@bin bin/fcitx5-plasma-theme-generator
@bin bin/kbd-layout-viewer5
+lib/qt5/plugins/plasma/
+lib/qt5/plugins/plasma/kcms/
+lib/qt5/plugins/plasma/kcms/systemsettings/
@so lib/qt5/plugins/plasma/kcms/systemsettings/kcm_fcitx5.so
share/applications/kbd-layout-viewer5.desktop
share/applications/kcm_fcitx5.desktop
share/applications/org.fcitx.fcitx5-config-qt.desktop
-share/kpackage/
-share/kpackage/kcms/
-share/kpackage/kcms/kcm_fcitx5/
-share/kpackage/kcms/kcm_fcitx5/contents/
-share/kpackage/kcms/kcm_fcitx5/contents/ui/
-share/kpackage/kcms/kcm_fcitx5/contents/ui/AddIMPage.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/AddonPage.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/BoolOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/ColorOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/ConfigGroup.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/ConfigPage.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/EnumOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/ExternalOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/FontOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/IntegerOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/KeyListOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/KeyOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/ListOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/OptionLoader.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/SaveWarningDialog.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/SelectLayoutSheet.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/StringOption.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/main.qml
-share/kpackage/kcms/kcm_fcitx5/contents/ui/utils.js
-share/kpackage/kcms/kcm_fcitx5/metadata.json
share/locale/ca/LC_MESSAGES/fcitx5-configtool.mo
share/locale/ca/LC_MESSAGES/kcm_fcitx5.mo
share/locale/da/LC_MESSAGES/fcitx5-configtool.mo
diff --git inputmethods/fcitx-gtk/Makefile inputmethods/fcitx-gtk/Makefile
index 3f652d276c1..98a459a2f07 100644
--- inputmethods/fcitx-gtk/Makefile
+++ inputmethods/fcitx-gtk/Makefile
@@ -1,6 +1,6 @@
COMMENT = GTK IM module for fcitx5
-DISTNAME = fcitx5-gtk-5.1.1
+DISTNAME = fcitx5-gtk-5.1.3
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
SHARED_LIBS = Fcitx5GClient 0.0 # 0.0
@@ -14,11 +14,13 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
# LGPLv2.1+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c gdk-3 gtk-3 xkbcommon
-WANTLIB += X11 cairo cairo-gobject harfbuzz pango-1.0 pangocairo-1.0
-WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 intl m
+WANTLIB += ${COMPILER_LIBCXX} X11 atk-1.0 c cairo cairo-gobject
+WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 graphene-1.0
+WANTLIB += gtk-3 gtk-4 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += vulkan xkbcommon
SITES = https://download.fcitx-im.org/fcitx5/fcitx5-gtk/
+EXTRACT_SUFX = .tar.zst
MODULES = devel/kf5
MODQT5_DEPS = No
@@ -35,12 +37,15 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = devel/harfbuzz,-main \
devel/pango \
graphics/gdk-pixbuf2 \
+ graphics/graphene \
x11/gnome/at-spi2-core \
+ x11/gtk+4,-main \
x11/gtk+3,-main \
x11/xkbcommon
CONFIGURE_ARGS = -DENABLE_GTK2_IM_MODULE=OFF \
- -DENABLE_GTK4_IM_MODULE=OFF \
+ -DENABLE_GTK3_IM_MODULE=ON \
+ -DENABLE_GTK4_IM_MODULE=ON \
-DCMAKE_CXX_FLAGS="-I${X11BASE}/include \
-I${LOCALBASE}/include"
diff --git inputmethods/fcitx-gtk/distinfo inputmethods/fcitx-gtk/distinfo
index 8641c386ebd..b985b2490bc 100644
--- inputmethods/fcitx-gtk/distinfo
+++ inputmethods/fcitx-gtk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-gtk-5.1.1.tar.xz) = 1s2nLeAgAx2vjaTbxseSPIAl7a3sGjrLmqKOnvt4sBM=
-SIZE (fcitx5-gtk-5.1.1.tar.xz) = 53716
+SHA256 (fcitx5-gtk-5.1.3.tar.zst) =
OtZG/kaINdTbRww3HIMK+bTrpqvlNGk7Q9v9xiquTMg=
+SIZE (fcitx5-gtk-5.1.3.tar.zst) = 67927
diff --git inputmethods/fcitx-gtk/pkg/PLIST inputmethods/fcitx-gtk/pkg/PLIST
index cd7c4a559f2..edd701dae66 100644
--- inputmethods/fcitx-gtk/pkg/PLIST
+++ inputmethods/fcitx-gtk/pkg/PLIST
@@ -1,4 +1,5 @@
@bin bin/fcitx5-gtk3-immodule-probing
+@bin bin/fcitx5-gtk4-immodule-probing
include/Fcitx5/GClient/
include/Fcitx5/GClient/fcitx-gclient/
include/Fcitx5/GClient/fcitx-gclient/fcitxgclient.h
@@ -10,6 +11,10 @@
lib/cmake/Fcitx5GClient/Fcitx5GClientTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/Fcitx5GClient/Fcitx5GClientTargets.cmake
lib/girepository-1.0/FcitxG-1.0.typelib
@so lib/gtk-3.0/3.0.0/immodules/im-fcitx5.so
+lib/gtk-4.0/
+lib/gtk-4.0/4.0.0/
+lib/gtk-4.0/4.0.0/immodules/
+@so lib/gtk-4.0/4.0.0/immodules/libim-fcitx5.so
@lib lib/libFcitx5GClient.so.${LIBFcitx5GClient_VERSION}
lib/pkgconfig/Fcitx5GClient.pc
share/gir-1.0/FcitxG-1.0.gir
diff --git inputmethods/fcitx-hangul/Makefile inputmethods/fcitx-hangul/Makefile
index 887afb9d7bd..90d8bdd22f9 100644
--- inputmethods/fcitx-hangul/Makefile
+++ inputmethods/fcitx-hangul/Makefile
@@ -1,12 +1,7 @@
COMMENT = Hangul wrapper for fcitx5
-V = 5.0.11
-PKGNAME = fcitx-hangul-$V
-REVISION = 0
-
-GH_ACCOUNT = fcitx
-GH_PROJECT = fcitx5-hangul
-GH_TAGNAME = $V
+DISTNAME = fcitx5-hangul-5.1.5
+PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods korean
@@ -14,6 +9,9 @@ HOMEPAGE = https://github.com/fcitx/fcitx5-hangul
MAINTAINER = Yifei Zhan <openbsd@zhan.science>
+SITES = https://download.fcitx-im.org/fcitx5/fcitx5-hangul/
+EXTRACT_SUFX = .tar.zst
+
# LGPLv2.1 or later
PERMIT_PACKAGE= Yes
diff --git inputmethods/fcitx-hangul/distinfo inputmethods/fcitx-hangul/distinfo
index c64be6ee7b4..cecda5f0adc 100644
--- inputmethods/fcitx-hangul/distinfo
+++ inputmethods/fcitx-hangul/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-hangul-5.0.11.tar.gz) =
XDeEPdZFG+tYsPNHQ+nO8Af3gazBdBmKAGZ7TPQ+xBc=
-SIZE (fcitx5-hangul-5.0.11.tar.gz) = 44221
+SHA256 (fcitx5-hangul-5.1.5.tar.zst) =
7sAjV19JsC2xptpKD4YPb8dWIsRAdka2N1LYBqKx8bg=
+SIZE (fcitx5-hangul-5.1.5.tar.zst) = 49042
diff --git inputmethods/fcitx-hangul/pkg/PLIST
inputmethods/fcitx-hangul/pkg/PLIST
index 2fef101d476..50a84203011 100644
--- inputmethods/fcitx-hangul/pkg/PLIST
+++ inputmethods/fcitx-hangul/pkg/PLIST
@@ -1,4 +1,4 @@
-@so lib/fcitx5/hangul.so
+@so lib/fcitx5/libhangul.so
share/fcitx5/addon/hangul.conf
share/fcitx5/hangul/
share/fcitx5/hangul/symbol.txt
diff --git inputmethods/fcitx-kkc/Makefile inputmethods/fcitx-kkc/Makefile
index 8bbee467579..bfd4f902fe6 100644
--- inputmethods/fcitx-kkc/Makefile
+++ inputmethods/fcitx-kkc/Makefile
@@ -1,24 +1,22 @@
COMMENT = libkkc wrapper for fcitx5
-V = 5.0.12
-PKGNAME = fcitx-kkc-$V
-REVISION = 0
-
-GH_ACCOUNT = fcitx
-GH_PROJECT = fcitx5-kkc
-GH_TAGNAME = $V
+DISTNAME = fcitx5-kkc-5.1.5
+PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods japanese
HOMEPAGE = https://github.com/fcitx/fcitx5-kkc
+SITES = https://download.fcitx-im.org/fcitx5/fcitx5-kkc/
+EXTRACT_SUFX = .tar.zst
+
MAINTAINER = Yifei Zhan <openbsd@zhan.science>
# GPLv3.0 or later
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt5WidgetsAddons
-WANTLIB += Fcitx5Utils Qt5Core Qt5Gui Qt5Widgets gee-0.8 gio-2.0
+WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt6WidgetsAddons
+WANTLIB += Fcitx5Utils GL Qt6Core Qt6Gui Qt6Widgets gee-0.8 gio-2.0
WANTLIB += glib-2.0 gobject-2.0 intl json-glib-1.0 kkc m
MODULES = devel/kf5
@@ -39,7 +37,4 @@ LIB_DEPENDS = inputmethods/fcitx \
pre-configure:
${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
-# ninja: error: unknown target 'test'
-NO_TEST = Yes
-
.include <bsd.port.mk>
diff --git inputmethods/fcitx-kkc/distinfo inputmethods/fcitx-kkc/distinfo
index 8631677c86e..894b1aa5fcc 100644
--- inputmethods/fcitx-kkc/distinfo
+++ inputmethods/fcitx-kkc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-kkc-5.0.12.tar.gz) =
GBe6URqRErhRbWiGJjwKKwOa4QBPmihRtlK1Gd8xmvE=
-SIZE (fcitx5-kkc-5.0.12.tar.gz) = 51553
+SHA256 (fcitx5-kkc-5.1.5.tar.zst) =
2FDeTmVJYksJsi6w8PHlZSPSqTQksBiZFKdQ8MHp4eg=
+SIZE (fcitx5-kkc-5.1.5.tar.zst) = 55759
diff --git inputmethods/fcitx-kkc/patches/patch-gui_CMakeLists_txt
inputmethods/fcitx-kkc/patches/patch-gui_CMakeLists_txt
index 930206da32f..e69de29bb2d 100644
--- inputmethods/fcitx-kkc/patches/patch-gui_CMakeLists_txt
+++ inputmethods/fcitx-kkc/patches/patch-gui_CMakeLists_txt
@@ -1,20 +0,0 @@
-Fix build with CMake 3.26:
-https://github.com/fcitx/fcitx5-kkc/commit/85b56d6289550174b15f108e355f39d7083f8c5c
-
-Index: gui/CMakeLists.txt
---- gui/CMakeLists.txt.orig
-+++ gui/CMakeLists.txt
-@@ -17,12 +17,11 @@ qt5_wrap_ui(KKC_CONFIG_SRCS dictwidget.ui adddictdialo
- add_library(fcitx5-kkc-config
- MODULE ${KKC_CONFIG_SRCS})
-
--add_definitions(-DQT_NO_KEYWORDS -std=c++11)
-+add_definitions(-DQT_NO_KEYWORDS)
-
- target_include_directories(fcitx5-kkc-config PRIVATE ${PROJECT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR})
-
- set_target_properties(fcitx5-kkc-config PROPERTIES
-- LINK_FLAGS "-Wl,--no-undefined"
- AUTOMOC TRUE
- AUTOUIC TRUE
- AUTOUIC_OPTIONS
"-tr=fcitx::tr2fcitx;--include=fcitxqti18nhelper.h")
diff --git inputmethods/fcitx-kkc/pkg/PLIST inputmethods/fcitx-kkc/pkg/PLIST
index 34dededd0b2..4ea348978a0 100644
--- inputmethods/fcitx-kkc/pkg/PLIST
+++ inputmethods/fcitx-kkc/pkg/PLIST
@@ -1,21 +1,21 @@
@so lib/fcitx5/kkc.so
-@so lib/fcitx5/qt5/libfcitx5-kkc-config.so
+@so lib/fcitx5/qt6/libfcitx5-kkc-config.so
share/fcitx5/addon/kkc.conf
share/fcitx5/inputmethod/
share/fcitx5/inputmethod/kkc.conf
share/fcitx5/kkc/
share/fcitx5/kkc/dictionary_list
share/fcitx5/kkc/rule
-share/icons/hicolor/16x16/apps/fcitx-kkc.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-kkc.png
-share/icons/hicolor/22x22/apps/fcitx-kkc.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-kkc.png
-share/icons/hicolor/24x24/apps/fcitx-kkc.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-kkc.png
-share/icons/hicolor/48x48/apps/fcitx-kkc.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-kkc.png
-share/icons/hicolor/64x64/apps/fcitx-kkc.png
-share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx-kkc.png
+share/icons/hicolor/16x16/apps/fcitx_kkc.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_kkc.png
+share/icons/hicolor/22x22/apps/fcitx_kkc.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_kkc.png
+share/icons/hicolor/24x24/apps/fcitx_kkc.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_kkc.png
+share/icons/hicolor/48x48/apps/fcitx_kkc.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_kkc.png
+share/icons/hicolor/64x64/apps/fcitx_kkc.png
+share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx_kkc.png
share/locale/ca/LC_MESSAGES/fcitx5-kkc.mo
share/locale/da/LC_MESSAGES/fcitx5-kkc.mo
share/locale/de/LC_MESSAGES/fcitx5-kkc.mo
diff --git inputmethods/fcitx-lua/Makefile inputmethods/fcitx-lua/Makefile
index 3e4783ca45d..a9358f980ce 100644
--- inputmethods/fcitx-lua/Makefile
+++ inputmethods/fcitx-lua/Makefile
@@ -1,6 +1,6 @@
COMMENT = Lua support for fcitx5
-DISTNAME = fcitx5-lua-5.0.12
+DISTNAME = fcitx5-lua-5.0.13
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods
@@ -13,6 +13,7 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
PERMIT_PACKAGE= Yes
SITES = https://download.fcitx-im.org/fcitx5/fcitx5-lua/
+EXTRACT_SUFX = .tar.zst
WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
WANTLIB += m
diff --git inputmethods/fcitx-lua/distinfo inputmethods/fcitx-lua/distinfo
index 18d9cfdc806..a6730f6e98a 100644
--- inputmethods/fcitx-lua/distinfo
+++ inputmethods/fcitx-lua/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-lua-5.0.12.tar.xz) =
5B/YcbzvvmCcsWHdxC7fAulf4pU301Kgs9rNfz8GcAI=
-SIZE (fcitx5-lua-5.0.12.tar.xz) = 33576
+SHA256 (fcitx5-lua-5.0.13.tar.zst) =
QNEdubtolS0ScGFI/TreO237wESKLNBxqAqtx92Vdzc=
+SIZE (fcitx5-lua-5.0.13.tar.zst) = 40578
diff --git inputmethods/fcitx-m17n/Makefile inputmethods/fcitx-m17n/Makefile
index e1eaefd046d..0d21da8d249 100644
--- inputmethods/fcitx-m17n/Makefile
+++ inputmethods/fcitx-m17n/Makefile
@@ -1,11 +1,7 @@
COMMENT = m17n wrapper for fcitx5
-V = 5.0.11
-PKGNAME = fcitx-m17n-$V
-
-GH_ACCOUNT = fcitx
-GH_PROJECT = fcitx5-m17n
-GH_TAGNAME = $V
+DISTNAME = fcitx5-m17n-5.1.2
+PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods
@@ -13,6 +9,9 @@ HOMEPAGE = https://github.com/fcitx/fcitx5-m17n
MAINTAINER = Yifei Zhan <openbsd@zhan.science>
+SITES = https://download.fcitx-im.org/fcitx5/fcitx5-m17n/
+EXTRACT_SUFX = .tar.zst
+
# LGPLv2.1 or later
PERMIT_PACKAGE= Yes
diff --git inputmethods/fcitx-m17n/distinfo inputmethods/fcitx-m17n/distinfo
index bd10fb59070..7fdb1338369 100644
--- inputmethods/fcitx-m17n/distinfo
+++ inputmethods/fcitx-m17n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-m17n-5.0.11.tar.gz) =
83z0eDeGPO7pYTbvQydG5Ag//zSvlXCDA62CSF0J+T0=
-SIZE (fcitx5-m17n-5.0.11.tar.gz) = 26069
+SHA256 (fcitx5-m17n-5.1.2.tar.zst) =
lqHmP+rqx/shQc6KgpH2GnZSIKP+4L83yviYcrk4dxY=
+SIZE (fcitx5-m17n-5.1.2.tar.zst) = 28595
diff --git inputmethods/fcitx-qt/Makefile inputmethods/fcitx-qt/Makefile
index ff21fab7a2d..7f4f07a7789 100644
--- inputmethods/fcitx-qt/Makefile
+++ inputmethods/fcitx-qt/Makefile
@@ -1,6 +1,6 @@
COMMENT = Qt library and IM module for fcitx5
-DISTNAME = fcitx5-qt-5.1.4
+DISTNAME = fcitx5-qt-5.1.8
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
SHARED_LIBS += Fcitx5Qt5WidgetsAddons 1.0 # 0.0
@@ -18,11 +18,13 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
# LGPL2.1+ for other files
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils GL Qt5Core Qt5DBus Qt5Gui
-WANTLIB += Qt5Widgets Qt6Concurrent Qt6Core Qt6DBus Qt6Gui Qt6WaylandClient
-WANTLIB += Qt6Widgets c m wayland-client wayland-cursor xcb xkbcommon
+WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils GL Qt5Concurrent Qt5Core
+WANTLIB += Qt5DBus Qt5Gui Qt5Widgets Qt6Concurrent Qt6Core Qt6DBus
+WANTLIB += Qt6Gui Qt6WaylandClient Qt6Widgets c m wayland-client
+WANTLIB += wayland-cursor xcb xkbcommon
SITES = https://download.fcitx-im.org/fcitx5/fcitx5-qt/
+EXTRACT_SUFX = .tar.zst
MODULES = devel/kf5 \
x11/qt6
diff --git inputmethods/fcitx-qt/distinfo inputmethods/fcitx-qt/distinfo
index 25750ffc04f..ec259b9e23f 100644
--- inputmethods/fcitx-qt/distinfo
+++ inputmethods/fcitx-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-qt-5.1.4.tar.xz) = klJuRCTUWQBEOyDw9XUAQXubfa1UQJs3CmcWbbfSsUk=
-SIZE (fcitx5-qt-5.1.4.tar.xz) = 92880
+SHA256 (fcitx5-qt-5.1.8.tar.zst) = /jRFUJ32Kt6OULhTPMKzp1njHEfs206LszjypjMCA3Y=
+SIZE (fcitx5-qt-5.1.8.tar.zst) = 128800
diff --git inputmethods/fcitx-qt/pkg/PLIST inputmethods/fcitx-qt/pkg/PLIST
index 5363f46c819..a188daabc8d 100644
--- inputmethods/fcitx-qt/pkg/PLIST
+++ inputmethods/fcitx-qt/pkg/PLIST
@@ -54,6 +54,8 @@
lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsConfig.cmake
lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsConfigVersion.cmake
lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsTargets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsTargets.cmake
+lib/fcitx5/qt5/
+@so lib/fcitx5/qt5/libfcitx-quickphrase-editor5.so
lib/fcitx5/qt6/
@so lib/fcitx5/qt6/libfcitx-quickphrase-editor5.so
@lib lib/libFcitx5Qt5DBusAddons.so.${LIBFcitx5Qt5DBusAddons_VERSION}
diff --git inputmethods/fcitx-table-extra/Makefile
inputmethods/fcitx-table-extra/Makefile
index f8d9d23130d..adc76741e54 100644
--- inputmethods/fcitx-table-extra/Makefile
+++ inputmethods/fcitx-table-extra/Makefile
@@ -1,7 +1,6 @@
COMMENT = extra table for Fcitx5
-V = 5.1.2
-DISTNAME = fcitx5-table-extra-$V
+DISTNAME = fcitx5-table-extra-5.1.6
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods chinese
@@ -14,7 +13,7 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
PERMIT_PACKAGE= Yes
SITES =
https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/
-DIST_SUBDIR = fcitx
+EXTRACT_SUFX = .tar.zst
MODULES = devel/kf5
diff --git inputmethods/fcitx-table-extra/distinfo
inputmethods/fcitx-table-extra/distinfo
index 519f1f56a52..949abbd1cd7 100644
--- inputmethods/fcitx-table-extra/distinfo
+++ inputmethods/fcitx-table-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx/fcitx5-table-extra-5.1.2.tar.xz) =
83YjSZeVfomI9VUqLcRtfmwUB7DGdtW42A8QGB8x6xA=
-SIZE (fcitx/fcitx5-table-extra-5.1.2.tar.xz) = 7629080
+SHA256 (fcitx5-table-extra-5.1.6.tar.zst) =
VMqaiAEfHIhomP1n6jkl/J9zSc3wpWZbs0NV52fvfW4=
+SIZE (fcitx5-table-extra-5.1.6.tar.zst) = 13837895
diff --git inputmethods/fcitx-table-extra/pkg/PLIST
inputmethods/fcitx-table-extra/pkg/PLIST
index 6bc459402d0..38c6c2d91df 100644
--- inputmethods/fcitx-table-extra/pkg/PLIST
+++ inputmethods/fcitx-table-extra/pkg/PLIST
@@ -51,138 +51,138 @@ share/fcitx5/table/wubi98.main.dict
share/fcitx5/table/zhengma-large.main.dict
share/fcitx5/table/zhengma-pinyin.main.dict
share/fcitx5/table/zhengma.main.dict
-share/icons/hicolor/16x16/apps/fcitx-array30-large.png
-share/icons/hicolor/16x16/apps/fcitx-array30.png
-share/icons/hicolor/16x16/apps/fcitx-boshiamy.png
-share/icons/hicolor/16x16/apps/fcitx-cantonese.png
-share/icons/hicolor/16x16/apps/fcitx-cantonhk.png
-share/icons/hicolor/16x16/apps/fcitx-easy-large.png
-share/icons/hicolor/16x16/apps/fcitx-jyutping-table.png
-share/icons/hicolor/16x16/apps/fcitx-quick-classic.png
-share/icons/hicolor/16x16/apps/fcitx-quick3.png
-share/icons/hicolor/16x16/apps/fcitx-quick5.png
-share/icons/hicolor/16x16/apps/fcitx-scj6.png
-share/icons/hicolor/16x16/apps/fcitx-stroke5.png
-share/icons/hicolor/16x16/apps/fcitx-t9.png
-share/icons/hicolor/16x16/apps/fcitx-wu.png
-share/icons/hicolor/16x16/apps/fcitx-zhengma.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-array30.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-quick3.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-quick5.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-scj6.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-t9.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-wu.png
-share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
-share/icons/hicolor/22x22/apps/fcitx-array30-large.png
-share/icons/hicolor/22x22/apps/fcitx-array30.png
-share/icons/hicolor/22x22/apps/fcitx-boshiamy.png
-share/icons/hicolor/22x22/apps/fcitx-cantonese.png
-share/icons/hicolor/22x22/apps/fcitx-cantonhk.png
-share/icons/hicolor/22x22/apps/fcitx-easy-large.png
-share/icons/hicolor/22x22/apps/fcitx-jyutping-table.png
-share/icons/hicolor/22x22/apps/fcitx-quick-classic.png
-share/icons/hicolor/22x22/apps/fcitx-quick3.png
-share/icons/hicolor/22x22/apps/fcitx-quick5.png
-share/icons/hicolor/22x22/apps/fcitx-scj6.png
-share/icons/hicolor/22x22/apps/fcitx-stroke5.png
-share/icons/hicolor/22x22/apps/fcitx-t9.png
-share/icons/hicolor/22x22/apps/fcitx-wu.png
-share/icons/hicolor/22x22/apps/fcitx-zhengma.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-array30.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-quick3.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-quick5.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-scj6.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-t9.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-wu.png
-share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
-share/icons/hicolor/24x24/apps/fcitx-array30-large.png
-share/icons/hicolor/24x24/apps/fcitx-array30.png
-share/icons/hicolor/24x24/apps/fcitx-boshiamy.png
-share/icons/hicolor/24x24/apps/fcitx-cantonese.png
-share/icons/hicolor/24x24/apps/fcitx-cantonhk.png
-share/icons/hicolor/24x24/apps/fcitx-easy-large.png
-share/icons/hicolor/24x24/apps/fcitx-jyutping-table.png
-share/icons/hicolor/24x24/apps/fcitx-quick-classic.png
-share/icons/hicolor/24x24/apps/fcitx-quick3.png
-share/icons/hicolor/24x24/apps/fcitx-quick5.png
-share/icons/hicolor/24x24/apps/fcitx-scj6.png
-share/icons/hicolor/24x24/apps/fcitx-stroke5.png
-share/icons/hicolor/24x24/apps/fcitx-t9.png
-share/icons/hicolor/24x24/apps/fcitx-wu.png
-share/icons/hicolor/24x24/apps/fcitx-zhengma.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-array30.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-quick3.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-quick5.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-scj6.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-t9.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-wu.png
-share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
-share/icons/hicolor/48x48/apps/fcitx-array30-large.png
-share/icons/hicolor/48x48/apps/fcitx-array30.png
-share/icons/hicolor/48x48/apps/fcitx-boshiamy.png
-share/icons/hicolor/48x48/apps/fcitx-cantonese.png
-share/icons/hicolor/48x48/apps/fcitx-cantonhk.png
-share/icons/hicolor/48x48/apps/fcitx-easy-large.png
-share/icons/hicolor/48x48/apps/fcitx-jyutping-table.png
-share/icons/hicolor/48x48/apps/fcitx-quick-classic.png
-share/icons/hicolor/48x48/apps/fcitx-quick3.png
-share/icons/hicolor/48x48/apps/fcitx-quick5.png
-share/icons/hicolor/48x48/apps/fcitx-scj6.png
-share/icons/hicolor/48x48/apps/fcitx-stroke5.png
-share/icons/hicolor/48x48/apps/fcitx-t9.png
-share/icons/hicolor/48x48/apps/fcitx-wu.png
-share/icons/hicolor/48x48/apps/fcitx-zhengma.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-array30.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-cantonese.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-cantonhk.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-jyutping-table.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-quick-classic.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-quick3.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-quick5.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-scj6.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-stroke5.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-t9.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-wu.png
-share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
-share/icons/hicolor/64x64/apps/fcitx-array30-large.png
-share/icons/hicolor/64x64/apps/fcitx-array30.png
-share/icons/hicolor/64x64/apps/fcitx-boshiamy.png
-share/icons/hicolor/64x64/apps/fcitx-easy-large.png
-share/icons/hicolor/64x64/apps/fcitx-t9.png
-share/icons/hicolor/64x64/apps/fcitx-zhengma.png
-share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx-array30-large.png
-share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx-array30.png
-share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx-boshiamy.png
-share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx-easy-large.png
-share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx-t9.png
-share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx-zhengma.png
+share/icons/hicolor/16x16/apps/fcitx_array30.png
+share/icons/hicolor/16x16/apps/fcitx_array30_large.png
+share/icons/hicolor/16x16/apps/fcitx_boshiamy.png
+share/icons/hicolor/16x16/apps/fcitx_cantonese.png
+share/icons/hicolor/16x16/apps/fcitx_cantonhk.png
+share/icons/hicolor/16x16/apps/fcitx_easy_large.png
+share/icons/hicolor/16x16/apps/fcitx_jyutping_table.png
+share/icons/hicolor/16x16/apps/fcitx_quick3.png
+share/icons/hicolor/16x16/apps/fcitx_quick5.png
+share/icons/hicolor/16x16/apps/fcitx_quick_classic.png
+share/icons/hicolor/16x16/apps/fcitx_scj6.png
+share/icons/hicolor/16x16/apps/fcitx_stroke5.png
+share/icons/hicolor/16x16/apps/fcitx_t9.png
+share/icons/hicolor/16x16/apps/fcitx_wu.png
+share/icons/hicolor/16x16/apps/fcitx_zhengma.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_array30.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_array30_large.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_boshiamy.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_cantonese.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_cantonhk.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_easy_large.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_jyutping_table.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_quick3.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_quick5.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_quick_classic.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_scj6.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_stroke5.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_t9.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_wu.png
+share/icons/hicolor/16x16/apps/org.fcitx.Fcitx5.fcitx_zhengma.png
+share/icons/hicolor/22x22/apps/fcitx_array30.png
+share/icons/hicolor/22x22/apps/fcitx_array30_large.png
+share/icons/hicolor/22x22/apps/fcitx_boshiamy.png
+share/icons/hicolor/22x22/apps/fcitx_cantonese.png
+share/icons/hicolor/22x22/apps/fcitx_cantonhk.png
+share/icons/hicolor/22x22/apps/fcitx_easy_large.png
+share/icons/hicolor/22x22/apps/fcitx_jyutping_table.png
+share/icons/hicolor/22x22/apps/fcitx_quick3.png
+share/icons/hicolor/22x22/apps/fcitx_quick5.png
+share/icons/hicolor/22x22/apps/fcitx_quick_classic.png
+share/icons/hicolor/22x22/apps/fcitx_scj6.png
+share/icons/hicolor/22x22/apps/fcitx_stroke5.png
+share/icons/hicolor/22x22/apps/fcitx_t9.png
+share/icons/hicolor/22x22/apps/fcitx_wu.png
+share/icons/hicolor/22x22/apps/fcitx_zhengma.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_array30.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_array30_large.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_boshiamy.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_cantonese.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_cantonhk.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_easy_large.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_jyutping_table.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_quick3.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_quick5.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_quick_classic.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_scj6.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_stroke5.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_t9.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_wu.png
+share/icons/hicolor/22x22/apps/org.fcitx.Fcitx5.fcitx_zhengma.png
+share/icons/hicolor/24x24/apps/fcitx_array30.png
+share/icons/hicolor/24x24/apps/fcitx_array30_large.png
+share/icons/hicolor/24x24/apps/fcitx_boshiamy.png
+share/icons/hicolor/24x24/apps/fcitx_cantonese.png
+share/icons/hicolor/24x24/apps/fcitx_cantonhk.png
+share/icons/hicolor/24x24/apps/fcitx_easy_large.png
+share/icons/hicolor/24x24/apps/fcitx_jyutping_table.png
+share/icons/hicolor/24x24/apps/fcitx_quick3.png
+share/icons/hicolor/24x24/apps/fcitx_quick5.png
+share/icons/hicolor/24x24/apps/fcitx_quick_classic.png
+share/icons/hicolor/24x24/apps/fcitx_scj6.png
+share/icons/hicolor/24x24/apps/fcitx_stroke5.png
+share/icons/hicolor/24x24/apps/fcitx_t9.png
+share/icons/hicolor/24x24/apps/fcitx_wu.png
+share/icons/hicolor/24x24/apps/fcitx_zhengma.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_array30.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_array30_large.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_boshiamy.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_cantonese.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_cantonhk.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_easy_large.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_jyutping_table.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_quick3.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_quick5.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_quick_classic.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_scj6.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_stroke5.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_t9.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_wu.png
+share/icons/hicolor/24x24/apps/org.fcitx.Fcitx5.fcitx_zhengma.png
+share/icons/hicolor/48x48/apps/fcitx_array30.png
+share/icons/hicolor/48x48/apps/fcitx_array30_large.png
+share/icons/hicolor/48x48/apps/fcitx_boshiamy.png
+share/icons/hicolor/48x48/apps/fcitx_cantonese.png
+share/icons/hicolor/48x48/apps/fcitx_cantonhk.png
+share/icons/hicolor/48x48/apps/fcitx_easy_large.png
+share/icons/hicolor/48x48/apps/fcitx_jyutping_table.png
+share/icons/hicolor/48x48/apps/fcitx_quick3.png
+share/icons/hicolor/48x48/apps/fcitx_quick5.png
+share/icons/hicolor/48x48/apps/fcitx_quick_classic.png
+share/icons/hicolor/48x48/apps/fcitx_scj6.png
+share/icons/hicolor/48x48/apps/fcitx_stroke5.png
+share/icons/hicolor/48x48/apps/fcitx_t9.png
+share/icons/hicolor/48x48/apps/fcitx_wu.png
+share/icons/hicolor/48x48/apps/fcitx_zhengma.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_array30.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_array30_large.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_boshiamy.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_cantonese.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_cantonhk.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_easy_large.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_jyutping_table.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_quick3.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_quick5.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_quick_classic.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_scj6.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_stroke5.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_t9.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_wu.png
+share/icons/hicolor/48x48/apps/org.fcitx.Fcitx5.fcitx_zhengma.png
+share/icons/hicolor/64x64/apps/fcitx_array30.png
+share/icons/hicolor/64x64/apps/fcitx_array30_large.png
+share/icons/hicolor/64x64/apps/fcitx_boshiamy.png
+share/icons/hicolor/64x64/apps/fcitx_easy_large.png
+share/icons/hicolor/64x64/apps/fcitx_t9.png
+share/icons/hicolor/64x64/apps/fcitx_zhengma.png
+share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx_array30.png
+share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx_array30_large.png
+share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx_boshiamy.png
+share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx_easy_large.png
+share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx_t9.png
+share/icons/hicolor/64x64/apps/org.fcitx.Fcitx5.fcitx_zhengma.png
share/metainfo/
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
diff --git inputmethods/fcitx-unikey/Makefile inputmethods/fcitx-unikey/Makefile
index beb2fbbaaca..5113a74815d 100644
--- inputmethods/fcitx-unikey/Makefile
+++ inputmethods/fcitx-unikey/Makefile
@@ -1,12 +1,7 @@
COMMENT = unikey Vietnamese support for fcitx5
-V = 5.0.13
-PKGNAME = fcitx-unikey-$V
-REVISION = 0
-
-GH_ACCOUNT = fcitx
-GH_PROJECT = fcitx5-unikey
-GH_TAGNAME = $V
+DISTNAME = fcitx5-unikey-5.1.5
+PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
CATEGORIES = inputmethods
@@ -14,11 +9,15 @@ HOMEPAGE = https://github.com/fcitx/fcitx5-unikey
MAINTAINER = Yifei Zhan <openbsd@zhan.science>
+
+SITES = https://download.fcitx-im.org/fcitx5/fcitx5-unikey/
+EXTRACT_SUFX = .tar.zst
+
# GPLv2.0+ and LGPLv2.0+
PERMIT_PACKAGE= Yes
-WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
-WANTLIB += Fcitx5Qt5WidgetsAddons Qt5Core Qt5Gui Qt5Widgets m
+WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt6WidgetsAddons
+WANTLIB += Fcitx5Utils GL Qt6Core Qt6Gui Qt6Widgets m
MODULES = devel/kf5
MODQT5_DEPS = No
diff --git inputmethods/fcitx-unikey/distinfo inputmethods/fcitx-unikey/distinfo
index 099225753d6..30629573a20 100644
--- inputmethods/fcitx-unikey/distinfo
+++ inputmethods/fcitx-unikey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fcitx5-unikey-5.0.13.tar.gz) =
Hyard9gpTTXcsdNWReT26O9MVqTDKYSxtdoeSCBynVo=
-SIZE (fcitx5-unikey-5.0.13.tar.gz) = 109149
+SHA256 (fcitx5-unikey-5.1.5.tar.zst) =
xJ9WLjgjojBYuCsZpujZK4GFNR7deWipQCwYUFlZXic=
+SIZE (fcitx5-unikey-5.1.5.tar.zst) = 114653
diff --git inputmethods/fcitx-unikey/pkg/PLIST
inputmethods/fcitx-unikey/pkg/PLIST
index 05e90cb8767..ece5a9ddf56 100644
--- inputmethods/fcitx-unikey/pkg/PLIST
+++ inputmethods/fcitx-unikey/pkg/PLIST
@@ -1,6 +1,6 @@
@so lib/fcitx5/libunikey.so
-@so lib/fcitx5/qt5/libfcitx5-unikey-keymap-editor.so
-@so lib/fcitx5/qt5/libfcitx5-unikey-macro-editor.so
+@so lib/fcitx5/qt6/libfcitx5-unikey-keymap-editor.so
+@so lib/fcitx5/qt6/libfcitx5-unikey-macro-editor.so
share/fcitx5/addon/unikey.conf
share/fcitx5/inputmethod/
share/fcitx5/inputmethod/unikey.conf
diff --git inputmethods/fcitx/Makefile inputmethods/fcitx/Makefile
index 877b97fc38c..d06decc26ef 100644
--- inputmethods/fcitx/Makefile
+++ inputmethods/fcitx/Makefile
@@ -1,11 +1,11 @@
COMMENT = flexible input method framework
-DISTNAME = fcitx5-5.1.7
+DISTNAME = fcitx5-5.1.11
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
SHARED_LIBS += Fcitx5Config 0.0 # 0.0
-SHARED_LIBS += Fcitx5Core 1.0 # 0.0
-SHARED_LIBS += Fcitx5Utils 1.0 # 0.0
+SHARED_LIBS += Fcitx5Core 1.1 # 0.0
+SHARED_LIBS += Fcitx5Utils 1.1 # 0.0
CATEGORIES = inputmethods chinese japanese korean
@@ -28,7 +28,7 @@ SITES =
https://download.fcitx-im.org/fcitx5/fcitx5/
SITES.data = https://download.fcitx-im.org/data/
DISTFILES.data= en_dict-20121020.tar.gz
-DIST_SUBDIR = fcitx
+EXTRACT_SUFX = .tar.zst
MODULES = devel/kf5
MODQT5_DEPS = No
diff --git inputmethods/fcitx/distinfo inputmethods/fcitx/distinfo
index d61607725ab..49abcb15667 100644
--- inputmethods/fcitx/distinfo
+++ inputmethods/fcitx/distinfo
@@ -1,4 +1,4 @@
-SHA256 (fcitx/en_dict-20121020.tar.gz) =
xEpdeEeSXuqeTS0EdI1ELNKN2SmaC1cu99kerE9abOs=
-SHA256 (fcitx/fcitx5-5.1.7.tar.xz) =
LvOOuqWcBHNOZJFXhBxPTif/OJ2szZkjPb+CtoZ7i4s=
-SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
-SIZE (fcitx/fcitx5-5.1.7.tar.xz) = 6867544
+SHA256 (en_dict-20121020.tar.gz) = xEpdeEeSXuqeTS0EdI1ELNKN2SmaC1cu99kerE9abOs=
+SHA256 (fcitx5-5.1.11.tar.zst) = S16yHUdG/p4Aai2ztYOpIK5xBcrm0CmntukRyhr13OE=
+SIZE (en_dict-20121020.tar.gz) = 630491
+SIZE (fcitx5-5.1.11.tar.zst) = 7666273
diff --git inputmethods/fcitx/pkg/PLIST inputmethods/fcitx/pkg/PLIST
index befbfc4792f..8a056df04f9 100644
--- inputmethods/fcitx/pkg/PLIST
+++ inputmethods/fcitx/pkg/PLIST
@@ -24,6 +24,7 @@ include/Fcitx5/Core/fcitx/addoninstance.h
include/Fcitx5/Core/fcitx/addoninstance_details.h
include/Fcitx5/Core/fcitx/addonloader.h
include/Fcitx5/Core/fcitx/addonmanager.h
+include/Fcitx5/Core/fcitx/candidateaction.h
include/Fcitx5/Core/fcitx/candidatelist.h
include/Fcitx5/Core/fcitx/event.h
include/Fcitx5/Core/fcitx/fcitxcore_export.h
diff --git inputmethods/fcitx/pkg/README inputmethods/fcitx/pkg/README
index 7fd572a3560..efe5edabd70 100644
--- inputmethods/fcitx/pkg/README
+++ inputmethods/fcitx/pkg/README
@@ -23,7 +23,7 @@ with CJK support. To install noto-cjk:
| M17N | fcitx-m17n |
| Vietnamese Telex | fcitx-unikey |
| Korean | fcitx-hangul |
-| Japanese | fcitx-skk / fcitx-kkc / fcitx-anthy |
+| Japanese | fcitx-kkc / fcitx-anthy |
| Symbols (e.g. IPA) | fcitx-table-other |
| Other tables [1] | fcitx-table-other |
|=============================================================|
@@ -73,6 +73,10 @@ If using KDE Plasma, you can also setup your input method
via:
For more information, please refer to Fcitx's wiki page:
https://www.fcitx-im.org/wiki/Setup_Fcitx_5
+You might be the only one speaking a particular language, please
+help improve the i18n support by reporting what works well and what does
+not. So that issues are known and a solution can be worked on.
+
Troubleshooting
===============
@@ -80,6 +84,12 @@ Fcitx includes fcitx5-diagnose, a tool to help you
troubleshoot.
If you need to send a bug report, remember to attach a copy of its
output, with sensitive information removed.
+Known issues
+============
+
+- Some emoji characters cannot be rendered and will instead be
+ displayed as blank spaces
+
Migrating from fcitx4
=====================
diff --git inputmethods/libime/Makefile inputmethods/libime/Makefile
index c28ca5e92b0..6c58e267988 100644
--- inputmethods/libime/Makefile
+++ inputmethods/libime/Makefile
@@ -1,9 +1,9 @@
COMMENT = library to support generic input method implementation
-DISTNAME = libime-1.1.5
+DISTNAME = libime-1.1.9
-SHARED_LIBS += IMECore 0.1 # 0.0
-SHARED_LIBS += IMEPinyin 0.1 # 0.0
+SHARED_LIBS += IMECore 0.2 # 0.0
+SHARED_LIBS += IMEPinyin 0.2 # 0.0
SHARED_LIBS += IMETable 1.0 # 0.0
CATEGORIES = inputmethods
@@ -24,13 +24,11 @@ SITES.data =
https://download.fcitx-im.org/data/
# Dictionary and Language Model
# Keep in sync with the post-patch section + upstream list
# https://github.com/fcitx/libime/blob/master/data/CMakeLists.txt
-DISTFILES.data += dict-20230412.tar.xz
-DISTFILES.data += lm_sc.arpa-20230712.tar.xz
-DISTFILES.data += table-20240108.tar.gz
-DISTFILES.data += table.tar.gz
+DISTFILES.data += dict-20241001.tar.zst
+DISTFILES.data += lm_sc.arpa-20241001.tar.zst
+DISTFILES.data += table-20240108.tar.zst
-EXTRACT_SUFX = .tar.xz
-DIST_SUBDIR = fcitx
+EXTRACT_SUFX = .tar.zst
COMPILER = base-clang ports-clang ports-gcc
@@ -47,12 +45,9 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = inputmethods/fcitx \
devel/boost
post-patch:
- @cp ${FULLDISTDIR}/dict-20230412.tar.xz \
- ${WRKSRC}/data/
- @cp ${FULLDISTDIR}/lm_sc.arpa-20230712.tar.xz \
- ${WRKSRC}/data/
- @cp ${FULLDISTDIR}/table-20240108.tar.gz \
- ${WRKSRC}/data/
- @cp ${FULLDISTDIR}/table.tar.gz \
+.for d in ${DISTFILES.data}
+ @cp ${FULLDISTDIR}/${d} \
${WRKSRC}/data/
+.endfor
+
.include <bsd.port.mk>
diff --git inputmethods/libime/distinfo inputmethods/libime/distinfo
index 45c1b634387..c7e2b629d38 100644
--- inputmethods/libime/distinfo
+++ inputmethods/libime/distinfo
@@ -1,10 +1,8 @@
-SHA256 (fcitx/dict-20230412.tar.xz) =
8F/Mr/loeQCqw9mtWoGyCIi1cyAUA/vNm7x5B9npdQc=
-SHA256 (fcitx/libime-1.1.5.tar.xz) =
FTYjFMwiIGPfCDQiUYpSskZv01PMjZlRloF5JpV0ZT4=
-SHA256 (fcitx/lm_sc.arpa-20230712.tar.xz) =
ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI=
-SHA256 (fcitx/table-20240108.tar.gz) =
cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4=
-SHA256 (fcitx/table.tar.gz) = YZYFPHJBJeOuPYvWsvkXLQyDtlsNQQ083mO3qNarh7c=
-SIZE (fcitx/dict-20230412.tar.xz) = 1162104
-SIZE (fcitx/libime-1.1.5.tar.xz) = 424824
-SIZE (fcitx/lm_sc.arpa-20230712.tar.xz) = 30701196
-SIZE (fcitx/table-20240108.tar.gz) = 4144659
-SIZE (fcitx/table.tar.gz) = 4144686
+SHA256 (dict-20241001.tar.zst) = 0zE7iKaGIKI7yNX5VkzxtniEjcevVBxPXwIZjlo2hr8=
+SHA256 (libime-1.1.9.tar.zst) = 2ePumcxMzDsyscQLppGonY1y+B1oUlIsSjiFvE9ArJI=
+SHA256 (lm_sc.arpa-20241001.tar.zst) =
VJNOc5Zus46k/o6unGHf5IavN9octTFqBrGcfSieMGM=
+SHA256 (table-20240108.tar.zst) = Pp2HsEo5PxMXI0csjqqGDdI8N4o9T2qQBVE7KpWzYUs=
+SIZE (dict-20241001.tar.zst) = 2315822
+SIZE (libime-1.1.9.tar.zst) = 563302
+SIZE (lm_sc.arpa-20241001.tar.zst) = 42023899
+SIZE (table-20240108.tar.zst) = 4656038
diff --git inputmethods/libime/pkg/PLIST inputmethods/libime/pkg/PLIST
index 57530a95140..a388603266b 100644
--- inputmethods/libime/pkg/PLIST
+++ inputmethods/libime/pkg/PLIST
@@ -26,6 +26,7 @@ include/LibIME/libime/core/utils.h
include/LibIME/libime/pinyin/
include/LibIME/libime/pinyin/libimepinyin_export.h
include/LibIME/libime/pinyin/pinyincontext.h
+include/LibIME/libime/pinyin/pinyincorrectionprofile.h
include/LibIME/libime/pinyin/pinyindata.h
include/LibIME/libime/pinyin/pinyindecoder.h
include/LibIME/libime/pinyin/pinyindictionary.h
diff --git inputmethods/xcb-imdkit/Makefile inputmethods/xcb-imdkit/Makefile
index 10c010f0d1c..3f9ed4cba00 100644
--- inputmethods/xcb-imdkit/Makefile
+++ inputmethods/xcb-imdkit/Makefile
@@ -1,8 +1,8 @@
COMMENT = implementation of xim protocol in xcb
-DISTNAME = xcb-imdkit-1.0.6
+DISTNAME = xcb-imdkit-1.0.9
-SHARED_LIBS += xcb-imdkit 1.0 # 1.0
+SHARED_LIBS += xcb-imdkit 2.0 # 2.0
CATEGORIES = inputmethods
@@ -16,7 +16,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += xcb xcb-util
SITES = https://download.fcitx-im.org/fcitx5/xcb-imdkit/
-EXTRACT_SUFX = .tar.xz
+EXTRACT_SUFX = .tar.zst
# C11
COMPILER = base-clang ports-clang ports-gcc
diff --git inputmethods/xcb-imdkit/distinfo inputmethods/xcb-imdkit/distinfo
index 69fe142be9a..535c225420c 100644
--- inputmethods/xcb-imdkit/distinfo
+++ inputmethods/xcb-imdkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-imdkit-1.0.6.tar.xz) = 7nE1P9jwSMHMhZFsx5rHrEQhkRCBAghfDcVQ150AUjA=
-SIZE (xcb-imdkit-1.0.6.tar.xz) = 347508
+SHA256 (xcb-imdkit-1.0.9.tar.zst) =
dCg7rO9NU2VdPd1uO5aaeH937p1mtu8laiASprotEQQ=
+SIZE (xcb-imdkit-1.0.9.tar.zst) = 580633
