On 2024/01/18 15:07:29 +1100, Yifei Zhan <openbsd@zhan.science> wrote: > Another wave of fcitx/opencc updates, in general nothing major, just > bugfixes here and there. A note is added to the fcitx pkg readme for > KDE Plasma users on using KDE's input configurator. > > converters/opencc: 1.1.6 -> 1.1.7 > - minor bugfixes for build infra > - translation updates > https://github.com/BYVoid/OpenCC/compare/ver.1.1.6...ver.1.1.7
only build-tested. diffs looks good but while here I noticed that it abuses CXXFLAGS for linker flags. Should be better to use MODCMAKE_LDFLAGS, updated diff below. ok op@ anyway, it can be fixed in a follow-up. > inputmethods/xcb-imdkit: 1.0.5 -> 1.0.6 > - minor bugfix on setting XCB event mask > > https://github.com/fcitx/xcb-imdkit/commit/2553f2ec1397cd93facde4bff9fd841056611ddc ok op@ > inputmethods/fcitx: 5.0.23 -> 5.1.7 > - libevent has been replaced by libuv > - bugfixes on xcb, dbus interface, ui > - bump major for Fcitx5Core, Fcitx5Utils > - slightly rework of existing patch for detecting OpenBSD > - translation updates > https://github.com/fcitx/fcitx5/commits/master/ ok op@ > inputmethods/fcitx-qt: 5.0.17 -> 5.1.4 > - disable nonfunctional qtwayland support for now > - add qt support for widgets addons and guiwrapper > - new shared library: Fcitx5Qt6WidgetsAddons > - bugfixes on ui > - translation updates > https://github.com/fcitx/fcitx5-qt/commits/master/ Few tweaks needed: - x11/qt6/qtwayland needs to be added to LIB_DEPENDS, not BUILD_DEPENDS. - needed to regen the wantlibs, see updated diff below. - libFcitx5Qt5WidgetsAddons needs a major bump since it lost a symbol (according to check_sym) - libFcitx5Qt5DBusAddons and libFcitx5Qt6DBusAddons both need a minor bump due to new symbol exported. otherwise, ok op@ > inputmethods/fcitx-gtk: 5.0.23 -> 5.1.1 > - minor bugfixes > - new binary for probing IM module > https://github.com/fcitx/fcitx5-gtk/commits/master/ this growed a WANTLIB on libc, otherwise ok op@ > inputmethods/fcitx-lua: 5.0.10 -> 5.0.12 > - translation updates > https://github.com/fcitx/fcitx5-lua/commits/master/ only build-tested. ok op@ (why isn't this one using MODULE=lang/lua ?) > inputmethods/libime: 1.0.17 -> 1.1.5 > - static data/table updates, new table > - drop outdated C11 patch > - minor bugfixes > https://github.com/fcitx/libime/commits/master/ only build-tested. - libIMECore and libIMEPinyin need a minor bump for new symbols addition - libIMETable needs a major bump for symbols removal otherwise ok op@ > inputmethods/fcitx-chinese-addons: 5.0.17 -> 5.1.3 > - bugfixes and translation updates > https://github.com/fcitx/fcitx5-chinese-addons/commits/master/ only build-tested. was missing a make update-plist, otherwise ok op@ btw, this could just inline $V since it's used only once. > inputmethods/fcitx-config-qt: 5.0.17 -> 5.1.3 > - add support for Qt6, translation updates > https://github.com/fcitx/fcitx5-configtool/commits/master/ ok op@ nit: i'd make sure to leave @tag update-desktop-database as the last entry in the file, even if make update-plist adds a few stuff under it. > inputmethods/fcitx-table-extra: 5.0.13 -> 5.1.2 > - translation and tables update > https://github.com/fcitx/fcitx5-table-extra/commits/master/ only build-tested. ok op@ This is my current setup for japanese: % pkg_info | grep fcitx fcitx-5.1.7 flexible input method framework fcitx-anthy-5.0.14p0 anthy wrapper for fcitx5 fcitx-configtool-qt-5.1.3 GUI configure tool for fcitx5 fcitx-gtk-5.1.1 GTK IM module for fcitx5 fcitx-qt-5.1.4 Qt library and IM module for fcitx5 which works just as well as before. I'm attaching an updated diff that covers all the ports with the tweaks as per above. Thanks, Omar Polo Index: converters/opencc/Makefile =================================================================== RCS file: /home/cvs/ports/converters/opencc/Makefile,v diff -u -p -r1.12 Makefile --- converters/opencc/Makefile 20 Apr 2023 09:07:36 -0000 1.12 +++ converters/opencc/Makefile 19 Jan 2024 16:21:39 -0000 @@ -1,6 +1,6 @@ COMMENT = convert between traditional and simplified Chinese -V = 1.1.6 +V = 1.1.7 DISTNAME = opencc-$V GH_ACCOUNT = BYVoid @@ -28,7 +28,8 @@ LIB_DEPENDS = textproc/libmarisa,-main CONFIGURE_ARGS = -DUSE_SYSTEM_MARISA=ON -CXXFLAGS += -I${LOCALBASE}/include -L${LOCALBASE}/lib +CXXFLAGS += -I${LOCALBASE}/include +MODCMAKE_LDFLAGS += -L${LOCALBASE}/lib MODPY_RUNDEP = No Index: converters/opencc/distinfo =================================================================== RCS file: /home/cvs/ports/converters/opencc/distinfo,v diff -u -p -r1.4 distinfo --- converters/opencc/distinfo 20 Apr 2023 09:07:36 -0000 1.4 +++ converters/opencc/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (opencc-1.1.6.tar.gz) = Fpv/QHH/6BTcFt99GA/2YQ20GPSBbpwM4Cz4dL3wWN8= -SIZE (opencc-1.1.6.tar.gz) = 3325614 +SHA256 (opencc-1.1.7.tar.gz) = gKEmdQlKDKyQ5w7lMOk23HbKCVPLBEP3KDwrVYY15P4= +SIZE (opencc-1.1.7.tar.gz) = 3311712 Index: converters/opencc/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/converters/opencc/pkg/PLIST,v diff -u -p -r1.4 PLIST --- converters/opencc/pkg/PLIST 11 Mar 2022 18:27:06 -0000 1.4 +++ converters/opencc/pkg/PLIST 19 Jan 2024 16:15:32 -0000 @@ -30,6 +30,12 @@ include/opencc/UTF8StringSlice.hpp include/opencc/UTF8Util.hpp include/opencc/opencc.h include/opencc/opencc_config.h +lib/cmake/ +lib/cmake/opencc/ +lib/cmake/opencc/OpenCCConfig.cmake +lib/cmake/opencc/OpenCCConfigVersion.cmake +lib/cmake/opencc/OpenCCTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/opencc/OpenCCTargets.cmake @lib lib/libopencc.so.${LIBopencc_VERSION} lib/pkgconfig/opencc.pc share/opencc/ Index: inputmethods/fcitx-chinese-addons/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-chinese-addons/Makefile,v diff -u -p -r1.7 Makefile --- inputmethods/fcitx-chinese-addons/Makefile 26 Sep 2023 17:58:07 -0000 1.7 +++ inputmethods/fcitx-chinese-addons/Makefile 19 Jan 2024 16:15:32 -0000 @@ -1,9 +1,8 @@ COMMENT = addons related to Chinese with IME bundled inside fcitx -V = 5.0.17 +V = 5.1.3 DISTNAME = fcitx5-chinese-addons-$V PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 CATEGORIES = inputmethods chinese @@ -14,9 +13,9 @@ MAINTAINER = Yifei Zhan <open...@zhan.sc # LGPLv2.1+ PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt5DBusAddons +WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core WANTLIB += Fcitx5Qt5WidgetsAddons Fcitx5Utils IMECore IMEPinyin -WANTLIB += IMETable Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Widgets +WANTLIB += IMETable Qt5Concurrent Qt5Core Qt5Gui Qt5Widgets WANTLIB += boost_iostreams-mt boost_regex-mt c m opencc SITES = https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/ Index: inputmethods/fcitx-chinese-addons/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-chinese-addons/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/fcitx-chinese-addons/distinfo 20 Apr 2023 09:09:43 -0000 1.2 +++ inputmethods/fcitx-chinese-addons/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,6 +1,6 @@ -SHA256 (fcitx/fcitx5-chinese-addons-5.0.17.tar.xz) = mCKurGt3LTjfi8pPgGeY0M746Ek8xgHdvgYLULb3X0Y= +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.0.17.tar.xz) = 234696 +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 Index: inputmethods/fcitx-chinese-addons/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-chinese-addons/pkg/PLIST,v diff -u -p -r1.2 PLIST --- inputmethods/fcitx-chinese-addons/pkg/PLIST 20 Apr 2023 09:09:43 -0000 1.2 +++ inputmethods/fcitx-chinese-addons/pkg/PLIST 19 Jan 2024 19:23:44 -0000 @@ -15,6 +15,8 @@ lib/cmake/Fcitx5ModulePunctuation/Fcitx5 @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 share/fcitx5/addon/chttrans.conf share/fcitx5/addon/fullwidth.conf Index: inputmethods/fcitx-config-qt/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-config-qt/Makefile,v diff -u -p -r1.4 Makefile --- inputmethods/fcitx-config-qt/Makefile 26 Sep 2023 11:43:23 -0000 1.4 +++ inputmethods/fcitx-config-qt/Makefile 19 Jan 2024 16:15:32 -0000 @@ -1,6 +1,6 @@ COMMENT = GUI configure tool for fcitx5 -V = 5.0.17 +V = 5.1.3 DISTNAME = fcitx5-configtool-$V PKGNAME = fcitx-configtool-qt-$V @@ -16,8 +16,8 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt5DBusAddons WANTLIB += Fcitx5Qt5WidgetsAddons Fcitx5Utils KF5ConfigCore KF5CoreAddons WANTLIB += KF5I18n KF5IconThemes KF5ItemViews KF5Package KF5Plasma -WANTLIB += KF5QuickAddons KF5Service KF5WidgetsAddons Qt5Core -WANTLIB += Qt5DBus Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick +WANTLIB += KF5QuickAddons KF5Service KF5WidgetsAddons KF5Declarative +WANTLIB += Qt5DBus Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick Qt5Core WANTLIB += Qt5Widgets Qt5X11Extras X11 c m xkbcommon xkbfile SITES = https://download.fcitx-im.org/fcitx5/fcitx5-configtool/ Index: inputmethods/fcitx-config-qt/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-config-qt/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/fcitx-config-qt/distinfo 20 Apr 2023 09:11:27 -0000 1.2 +++ inputmethods/fcitx-config-qt/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx5-configtool-5.0.17.tar.xz) = +LYZbSPRSmrMmis9vDdytuWy46UUe3i2SSOKPXdXhtU= -SIZE (fcitx/fcitx5-configtool-5.0.17.tar.xz) = 113760 +SHA256 (fcitx/fcitx5-configtool-5.1.3.tar.xz) = H+7zGxuw+JAWhFohfl9Wsma4bBpEtO1kC0nBN43M3N4= +SIZE (fcitx/fcitx5-configtool-5.1.3.tar.xz) = 110124 Index: inputmethods/fcitx-config-qt/patches/patch-src_CMakeLists_txt =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-config-qt/patches/patch-src_CMakeLists_txt,v diff -u -p -r1.1 patch-src_CMakeLists_txt --- inputmethods/fcitx-config-qt/patches/patch-src_CMakeLists_txt 13 May 2022 15:37:47 -0000 1.1 +++ inputmethods/fcitx-config-qt/patches/patch-src_CMakeLists_txt 19 Jan 2024 16:15:32 -0000 @@ -1,7 +1,7 @@ Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -7,4 +7,6 @@ if (ENABLE_CONFIG_QT) +@@ -7,7 +7,9 @@ if (ENABLE_CONFIG_QT) add_subdirectory(configtool) endif() @@ -9,3 +9,6 @@ Index: src/CMakeLists.txt +if (ENABLE_MIGRATOR) + add_subdirectory(migrator) +endif() + + if (ENABLE_KCM) + add_subdirectory(plasmathemegenerator) Index: inputmethods/fcitx-config-qt/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-config-qt/pkg/PLIST,v diff -u -p -r1.2 PLIST --- inputmethods/fcitx-config-qt/pkg/PLIST 20 Apr 2023 09:11:27 -0000 1.2 +++ inputmethods/fcitx-config-qt/pkg/PLIST 19 Jan 2024 19:26:42 -0000 @@ -1,61 +1,58 @@ @bin bin/fcitx5-config-qt @bin bin/fcitx5-plasma-theme-generator @bin bin/kbd-layout-viewer5 -lib/qt5/plugins/kcms/ -@so lib/qt5/plugins/kcms/kcm_fcitx5.so +@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/org.fcitx.fcitx5.kcm/ -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/ -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/AddIMPage.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/AddonPage.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/BoolOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/ColorOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/ConfigGroup.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/ConfigPage.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/EnumOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/ExternalOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/FontOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/IntegerOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/KeyListOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/KeyOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/ListOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/OptionLoader.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/SaveWarningDialog.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/SelectLayoutSheet.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/StringOption.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/main.qml -share/kpackage/kcms/org.fcitx.fcitx5.kcm/contents/ui/utils.js -share/kpackage/kcms/org.fcitx.fcitx5.kcm/metadata.desktop -share/kpackage/kcms/org.fcitx.fcitx5.kcm/metadata.json -share/kservices5/kcm_fcitx5.desktop +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/org.fcitx.fcitx5.kcm.mo +share/locale/ca/LC_MESSAGES/kcm_fcitx5.mo share/locale/da/LC_MESSAGES/fcitx5-configtool.mo -share/locale/da/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/da/LC_MESSAGES/kcm_fcitx5.mo share/locale/de/LC_MESSAGES/fcitx5-configtool.mo -share/locale/de/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo -share/locale/es/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/de/LC_MESSAGES/kcm_fcitx5.mo +share/locale/es/LC_MESSAGES/kcm_fcitx5.mo share/locale/fr/LC_MESSAGES/fcitx5-configtool.mo -share/locale/fr/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/fr/LC_MESSAGES/kcm_fcitx5.mo share/locale/he/LC_MESSAGES/fcitx5-configtool.mo -share/locale/he/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/he/LC_MESSAGES/kcm_fcitx5.mo share/locale/ja/LC_MESSAGES/fcitx5-configtool.mo -share/locale/ja/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/ja/LC_MESSAGES/kcm_fcitx5.mo share/locale/ko/LC_MESSAGES/fcitx5-configtool.mo -share/locale/ko/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/ko/LC_MESSAGES/kcm_fcitx5.mo share/locale/ru/LC_MESSAGES/fcitx5-configtool.mo -share/locale/ru/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/ru/LC_MESSAGES/kcm_fcitx5.mo share/locale/tr/LC_MESSAGES/fcitx5-configtool.mo -share/locale/tr/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/tr/LC_MESSAGES/kcm_fcitx5.mo share/locale/vi/LC_MESSAGES/fcitx5-configtool.mo -share/locale/vi/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/vi/LC_MESSAGES/kcm_fcitx5.mo share/locale/zh_CN/LC_MESSAGES/fcitx5-configtool.mo -share/locale/zh_CN/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo +share/locale/zh_CN/LC_MESSAGES/kcm_fcitx5.mo share/locale/zh_TW/LC_MESSAGES/fcitx5-configtool.mo -share/locale/zh_TW/LC_MESSAGES/org.fcitx.fcitx5.kcm.mo -share/metainfo/org.fcitx.fcitx5.kcm.appdata.xml +share/locale/zh_TW/LC_MESSAGES/kcm_fcitx5.mo @tag update-desktop-database Index: inputmethods/fcitx-gtk/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-gtk/Makefile,v diff -u -p -r1.5 Makefile --- inputmethods/fcitx-gtk/Makefile 26 Sep 2023 11:43:23 -0000 1.5 +++ inputmethods/fcitx-gtk/Makefile 19 Jan 2024 18:59:31 -0000 @@ -1,6 +1,6 @@ COMMENT = GTK IM module for fcitx5 -DISTNAME = fcitx5-gtk-5.0.23 +DISTNAME = fcitx5-gtk-5.1.1 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} SHARED_LIBS = Fcitx5GClient 0.0 # 0.0 @@ -14,7 +14,7 @@ MAINTAINER = Yifei Zhan <open...@zhan.sc # LGPLv2.1+ PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} atk-1.0 gdk-3 gtk-3 xkbcommon +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 Index: inputmethods/fcitx-gtk/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-gtk/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/fcitx-gtk/distinfo 20 Apr 2023 09:12:16 -0000 1.2 +++ inputmethods/fcitx-gtk/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (fcitx5-gtk-5.0.23.tar.xz) = rRJM5/G7ymUN2kfLc8VXKRNBlRPqz56+hMn2dTySCGg= -SIZE (fcitx5-gtk-5.0.23.tar.xz) = 53436 +SHA256 (fcitx5-gtk-5.1.1.tar.xz) = 1s2nLeAgAx2vjaTbxseSPIAl7a3sGjrLmqKOnvt4sBM= +SIZE (fcitx5-gtk-5.1.1.tar.xz) = 53716 Index: inputmethods/fcitx-gtk/patches/patch-CMakeLists_txt =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-gtk/patches/patch-CMakeLists_txt,v diff -u -p -r1.1 patch-CMakeLists_txt --- inputmethods/fcitx-gtk/patches/patch-CMakeLists_txt 13 May 2022 15:37:48 -0000 1.1 +++ inputmethods/fcitx-gtk/patches/patch-CMakeLists_txt 19 Jan 2024 16:15:32 -0000 @@ -1,7 +1,7 @@ Index: CMakeLists.txt --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -3,7 +3,7 @@ project(fcitx5-gtk VERSION 5.0.10) +@@ -3,7 +3,7 @@ project(fcitx5-gtk VERSION 5.1.1) find_package(ECM REQUIRED 1.0.0) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) Index: inputmethods/fcitx-gtk/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-gtk/pkg/PLIST,v diff -u -p -r1.1 PLIST --- inputmethods/fcitx-gtk/pkg/PLIST 13 May 2022 15:37:48 -0000 1.1 +++ inputmethods/fcitx-gtk/pkg/PLIST 19 Jan 2024 16:15:32 -0000 @@ -1,3 +1,4 @@ +@bin bin/fcitx5-gtk3-immodule-probing include/Fcitx5/GClient/ include/Fcitx5/GClient/fcitx-gclient/ include/Fcitx5/GClient/fcitx-gclient/fcitxgclient.h Index: inputmethods/fcitx-lua/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-lua/Makefile,v diff -u -p -r1.4 Makefile --- inputmethods/fcitx-lua/Makefile 26 Sep 2023 11:43:23 -0000 1.4 +++ inputmethods/fcitx-lua/Makefile 19 Jan 2024 16:15:32 -0000 @@ -1,6 +1,6 @@ COMMENT = Lua support for fcitx5 -DISTNAME = fcitx5-lua-5.0.10 +DISTNAME = fcitx5-lua-5.0.12 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} CATEGORIES = inputmethods Index: inputmethods/fcitx-lua/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-lua/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/fcitx-lua/distinfo 20 Apr 2023 09:16:51 -0000 1.2 +++ inputmethods/fcitx-lua/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (fcitx5-lua-5.0.10.tar.xz) = Kd3TUINtegWgW5GIl/ikkEt2T3RsxCyzTHBcdU80cI8= -SIZE (fcitx5-lua-5.0.10.tar.xz) = 34264 +SHA256 (fcitx5-lua-5.0.12.tar.xz) = 5B/YcbzvvmCcsWHdxC7fAulf4pU301Kgs9rNfz8GcAI= +SIZE (fcitx5-lua-5.0.12.tar.xz) = 33576 Index: inputmethods/fcitx-qt/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-qt/Makefile,v diff -u -p -r1.5 Makefile --- inputmethods/fcitx-qt/Makefile 26 Sep 2023 11:43:23 -0000 1.5 +++ inputmethods/fcitx-qt/Makefile 19 Jan 2024 18:56:44 -0000 @@ -1,11 +1,12 @@ COMMENT = Qt library and IM module for fcitx5 -DISTNAME = fcitx5-qt-5.0.17 +DISTNAME = fcitx5-qt-5.1.4 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -SHARED_LIBS += Fcitx5Qt5WidgetsAddons 0.0 # 0.0 -SHARED_LIBS += Fcitx5Qt5DBusAddons 0.0 # 0.0 -SHARED_LIBS += Fcitx5Qt6DBusAddons 0.0 # 0.0 +SHARED_LIBS += Fcitx5Qt5WidgetsAddons 1.0 # 0.0 +SHARED_LIBS += Fcitx5Qt5DBusAddons 0.1 # 0.0 +SHARED_LIBS += Fcitx5Qt6DBusAddons 0.1 # 0.0 +SHARED_LIBS += Fcitx5Qt6WidgetsAddons 0.0 # 0.0 CATEGORIES = inputmethods @@ -17,9 +18,9 @@ MAINTAINER = Yifei Zhan <open...@zhan.sc # LGPL2.1+ for other files PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils GL Qt5Concurrent Qt5Core -WANTLIB += Qt5DBus Qt5Gui Qt5Widgets Qt6Core Qt6DBus Qt6Gui Qt6Widgets -WANTLIB += c m xcb xkbcommon +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 SITES = https://download.fcitx-im.org/fcitx5/fcitx5-qt/ @@ -35,7 +36,8 @@ RUN_DEPENDS = devel/desktop-file-utils inputmethods/fcitx \ misc/shared-mime-info -LIB_DEPENDS = inputmethods/fcitx +LIB_DEPENDS = inputmethods/fcitx \ + x11/qt6/qtwayland CONFIGURE_ARGS = -DENABLE_QT4=OFF \ -DENABLE_QT6=ON Index: inputmethods/fcitx-qt/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-qt/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/fcitx-qt/distinfo 20 Apr 2023 09:18:17 -0000 1.2 +++ inputmethods/fcitx-qt/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (fcitx5-qt-5.0.17.tar.xz) = QmjnoSd2kqedz/COZi0edEB+WYph09A4a8ZKUYCekfQ= -SIZE (fcitx5-qt-5.0.17.tar.xz) = 84680 +SHA256 (fcitx5-qt-5.1.4.tar.xz) = klJuRCTUWQBEOyDw9XUAQXubfa1UQJs3CmcWbbfSsUk= +SIZE (fcitx5-qt-5.1.4.tar.xz) = 92880 Index: inputmethods/fcitx-qt/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-qt/pkg/PLIST,v diff -u -p -r1.3 PLIST --- inputmethods/fcitx-qt/pkg/PLIST 20 Apr 2023 09:18:18 -0000 1.3 +++ inputmethods/fcitx-qt/pkg/PLIST 19 Jan 2024 16:15:32 -0000 @@ -1,3 +1,5 @@ +@bin bin/fcitx5-qt5-immodule-probing +@bin bin/fcitx5-qt6-immodule-probing include/Fcitx5Qt5/ include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/ include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/fcitx5qt5dbusaddons_export.h @@ -23,7 +25,15 @@ include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fc include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtinputcontextproxy.h include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtinputmethodproxy.h include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitxqtwatcher.h +include/Fcitx5Qt6/Fcitx5QtWidgetsAddons/ +include/Fcitx5Qt6/Fcitx5QtWidgetsAddons/fcitx5qt6widgetsaddons_export.h +include/Fcitx5Qt6/Fcitx5QtWidgetsAddons/fcitxqtconfiguifactory.h +include/Fcitx5Qt6/Fcitx5QtWidgetsAddons/fcitxqtconfiguiplugin.h +include/Fcitx5Qt6/Fcitx5QtWidgetsAddons/fcitxqtconfiguiwidget.h +include/Fcitx5Qt6/Fcitx5QtWidgetsAddons/fcitxqti18nhelper.h +include/Fcitx5Qt6/Fcitx5QtWidgetsAddons/fcitxqtkeysequencewidget.h include/Fcitx5Qt6/fcitx5qt6dbusaddons_version.h +include/Fcitx5Qt6/fcitx5qt6widgetsaddons_version.h lib/cmake/Fcitx5Qt5DBusAddons/ lib/cmake/Fcitx5Qt5DBusAddons/Fcitx5Qt5DBusAddonsConfig.cmake lib/cmake/Fcitx5Qt5DBusAddons/Fcitx5Qt5DBusAddonsConfigVersion.cmake @@ -39,15 +49,23 @@ lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6D lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsConfigVersion.cmake lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsTargets${MODCMAKE_BUILD_SUFFIX} lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsTargets.cmake -lib/fcitx5/qt5/ -@so lib/fcitx5/qt5/libfcitx-quickphrase-editor5.so +lib/cmake/Fcitx5Qt6WidgetsAddons/ +lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsConfig.cmake +lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsConfigVersion.cmake +lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsTargets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/Fcitx5Qt6WidgetsAddons/Fcitx5Qt6WidgetsAddonsTargets.cmake +lib/fcitx5/qt6/ +@so lib/fcitx5/qt6/libfcitx-quickphrase-editor5.so @lib lib/libFcitx5Qt5DBusAddons.so.${LIBFcitx5Qt5DBusAddons_VERSION} @lib lib/libFcitx5Qt5WidgetsAddons.so.${LIBFcitx5Qt5WidgetsAddons_VERSION} @lib lib/libFcitx5Qt6DBusAddons.so.${LIBFcitx5Qt6DBusAddons_VERSION} +@lib lib/libFcitx5Qt6WidgetsAddons.so.${LIBFcitx5Qt6WidgetsAddons_VERSION} @so lib/qt5/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so @so lib/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so @bin libexec/fcitx5-qt5-gui-wrapper +@bin libexec/fcitx5-qt6-gui-wrapper share/applications/org.fcitx.fcitx5-qt5-gui-wrapper.desktop +share/applications/org.fcitx.fcitx5-qt6-gui-wrapper.desktop share/locale/ca/LC_MESSAGES/fcitx5-qt.mo share/locale/da/LC_MESSAGES/fcitx5-qt.mo share/locale/de/LC_MESSAGES/fcitx5-qt.mo Index: inputmethods/fcitx-table-extra/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-table-extra/Makefile,v diff -u -p -r1.5 Makefile --- inputmethods/fcitx-table-extra/Makefile 26 Sep 2023 11:43:23 -0000 1.5 +++ inputmethods/fcitx-table-extra/Makefile 19 Jan 2024 16:15:32 -0000 @@ -1,9 +1,8 @@ COMMENT = extra table for Fcitx5 -V = 5.0.13 +V = 5.1.2 DISTNAME = fcitx5-table-extra-$V PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 CATEGORIES = inputmethods chinese Index: inputmethods/fcitx-table-extra/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-table-extra/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/fcitx-table-extra/distinfo 20 Apr 2023 09:18:56 -0000 1.2 +++ inputmethods/fcitx-table-extra/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (fcitx/fcitx5-table-extra-5.0.13.tar.xz) = auwD5ssUCNhEeJgiYTLnImBxU1wFhONeBBWeTF90oBY= -SIZE (fcitx/fcitx5-table-extra-5.0.13.tar.xz) = 7288400 +SHA256 (fcitx/fcitx5-table-extra-5.1.2.tar.xz) = 83YjSZeVfomI9VUqLcRtfmwUB7DGdtW42A8QGB8x6xA= +SIZE (fcitx/fcitx5-table-extra-5.1.2.tar.xz) = 7629080 Index: inputmethods/fcitx-table-extra/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx-table-extra/pkg/PLIST,v diff -u -p -r1.2 PLIST --- inputmethods/fcitx-table-extra/pkg/PLIST 20 Apr 2023 09:18:56 -0000 1.2 +++ inputmethods/fcitx-table-extra/pkg/PLIST 19 Jan 2024 16:15:32 -0000 @@ -18,6 +18,7 @@ share/fcitx5/inputmethod/stroke5.conf share/fcitx5/inputmethod/t9.conf share/fcitx5/inputmethod/wu.conf share/fcitx5/inputmethod/wubi-large.conf +share/fcitx5/inputmethod/wubi98-large.conf share/fcitx5/inputmethod/wubi98-pinyin.conf share/fcitx5/inputmethod/wubi98-single.conf share/fcitx5/inputmethod/wubi98.conf @@ -43,6 +44,7 @@ share/fcitx5/table/stroke5.main.dict share/fcitx5/table/t9.main.dict share/fcitx5/table/wu.main.dict share/fcitx5/table/wubi-large.main.dict +share/fcitx5/table/wubi98-large.main.dict share/fcitx5/table/wubi98-pinyin.main.dict share/fcitx5/table/wubi98-single.main.dict share/fcitx5/table/wubi98.main.dict Index: inputmethods/fcitx/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx/Makefile,v diff -u -p -r1.27 Makefile --- inputmethods/fcitx/Makefile 26 Sep 2023 17:58:07 -0000 1.27 +++ inputmethods/fcitx/Makefile 19 Jan 2024 16:15:32 -0000 @@ -1,12 +1,11 @@ COMMENT = flexible input method framework -DISTNAME = fcitx5-5.0.23 +DISTNAME = fcitx5-5.1.7 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 SHARED_LIBS += Fcitx5Config 0.0 # 0.0 -SHARED_LIBS += Fcitx5Core 0.0 # 0.0 -SHARED_LIBS += Fcitx5Utils 0.0 # 0.0 +SHARED_LIBS += Fcitx5Core 1.0 # 0.0 +SHARED_LIBS += Fcitx5Utils 1.0 # 0.0 CATEGORIES = inputmethods chinese japanese korean @@ -17,13 +16,13 @@ MAINTAINER = Yifei Zhan <open...@zhan.sc # LGPLv2.1+ PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} c cairo dbus-1 enchant-2 event_core +WANTLIB += ${COMPILER_LIBCXX} c cairo dbus-1 enchant-2 WANTLIB += execinfo expat gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gobject-2.0 harfbuzz intl json-c kvm m pango-1.0 WANTLIB += pangocairo-1.0 pthread uuid xcb xcb-ewmh xcb-icccm WANTLIB += xcb-imdkit xcb-keysyms xcb-randr xcb-render WANTLIB += xcb-shape xcb-util xcb-xfixes xcb-xinerama xcb-xkb -WANTLIB += xkbcommon xkbcommon-x11 xkbfile z +WANTLIB += xkbcommon xkbcommon-x11 xkbfile z uv SITES = https://download.fcitx-im.org/fcitx5/fcitx5/ SITES.data = https://download.fcitx-im.org/data/ @@ -46,7 +45,7 @@ RUN_DEPENDS = devel/desktop-file-utils LIB_DEPENDS = devel/harfbuzz,-main \ devel/json-c \ - devel/libevent2 \ + devel/libuv \ devel/pango \ graphics/gdk-pixbuf2 \ inputmethods/xcb-imdkit \ Index: inputmethods/fcitx/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx/distinfo,v diff -u -p -r1.6 distinfo --- inputmethods/fcitx/distinfo 20 Apr 2023 09:20:38 -0000 1.6 +++ inputmethods/fcitx/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,4 +1,4 @@ SHA256 (fcitx/en_dict-20121020.tar.gz) = xEpdeEeSXuqeTS0EdI1ELNKN2SmaC1cu99kerE9abOs= -SHA256 (fcitx/fcitx5-5.0.23.tar.xz) = BPIJpkBiJc4ZeF+NnTvbJTlEWG7c+pYBQU/N2oobE6A= +SHA256 (fcitx/fcitx5-5.1.7.tar.xz) = LvOOuqWcBHNOZJFXhBxPTif/OJ2szZkjPb+CtoZ7i4s= SIZE (fcitx/en_dict-20121020.tar.gz) = 630491 -SIZE (fcitx/fcitx5-5.0.23.tar.xz) = 6828856 +SIZE (fcitx/fcitx5-5.1.7.tar.xz) = 6867544 Index: inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake,v diff -u -p -r1.1 patch-cmake_Fcitx5CompilerSettings_cmake --- inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake 13 May 2022 15:37:46 -0000 1.1 +++ inputmethods/fcitx/patches/patch-cmake_Fcitx5CompilerSettings_cmake 19 Jan 2024 16:15:32 -0000 @@ -1,12 +1,12 @@ Index: cmake/Fcitx5CompilerSettings.cmake --- cmake/Fcitx5CompilerSettings.cmake.orig +++ cmake/Fcitx5CompilerSettings.cmake -@@ -7,8 +7,6 @@ set(CMAKE_C_STANDARD 99) - +@@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 99) set(CMAKE_C_FLAGS "-Wall -Wextra ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-Wall -Wextra ${CMAKE_CXX_FLAGS}") --set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}") --set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") - set(CMAKE_C_VISIBILITY_PRESET hidden) - set(CMAKE_CXX_VISIBILITY_PRESET hidden) +-if(NOT APPLE) ++if(NOT (APPLE OR CMAKE_SYSTEM_NAME MATCHES "OpenBSD")) + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}") + set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -Wl,--as-needed ${CMAKE_MODULE_LINKER_FLAGS}") + endif() Index: inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_misc_cpp =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_misc_cpp,v diff -u -p -r1.1 patch-src_lib_fcitx-utils_misc_cpp --- inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_misc_cpp 13 May 2022 15:37:46 -0000 1.1 +++ inputmethods/fcitx/patches/patch-src_lib_fcitx-utils_misc_cpp 19 Jan 2024 16:15:32 -0000 @@ -1,7 +1,7 @@ Index: src/lib/fcitx-utils/misc.cpp --- src/lib/fcitx-utils/misc.cpp.orig +++ src/lib/fcitx-utils/misc.cpp -@@ -86,7 +86,7 @@ std::string getProcessName(pid_t pid) { +@@ -88,7 +88,7 @@ std::string getProcessName(pid_t pid) { struct kinfo_proc2 *kp = kvm_getproc2(vm, KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &cnt); #else Index: inputmethods/fcitx/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx/pkg/PLIST,v diff -u -p -r1.2 PLIST --- inputmethods/fcitx/pkg/PLIST 20 Apr 2023 09:20:38 -0000 1.2 +++ inputmethods/fcitx/pkg/PLIST 19 Jan 2024 16:15:32 -0000 @@ -83,6 +83,7 @@ include/Fcitx5/Utils/fcitx-utils/dbus/me include/Fcitx5/Utils/fcitx-utils/dbus/message_details.h include/Fcitx5/Utils/fcitx-utils/dbus/objectvtable.h include/Fcitx5/Utils/fcitx-utils/dbus/servicewatcher.h +include/Fcitx5/Utils/fcitx-utils/dbus/variant.h include/Fcitx5/Utils/fcitx-utils/element.h include/Fcitx5/Utils/fcitx-utils/event.h include/Fcitx5/Utils/fcitx-utils/eventdispatcher.h @@ -191,6 +192,7 @@ lib/fcitx5/libexec/ @so lib/fcitx5/libtestim.so @so lib/fcitx5/libtestui.so @so lib/fcitx5/libunicode.so +@so lib/fcitx5/libvirtualkeyboard.so @so lib/fcitx5/libxcb.so @so lib/fcitx5/libxim.so @lib lib/libFcitx5Config.so.${LIBFcitx5Config_VERSION} @@ -200,7 +202,6 @@ lib/pkgconfig/Fcitx5Config.pc lib/pkgconfig/Fcitx5Core.pc lib/pkgconfig/Fcitx5Module.pc lib/pkgconfig/Fcitx5Utils.pc -@bin libexec/fcitx5-wayland-launcher share/applications/fcitx5-configtool.desktop share/applications/org.fcitx.Fcitx5.desktop share/dbus-1/services/org.fcitx.Fcitx5.service @@ -228,6 +229,7 @@ share/fcitx5/addon/notifications.conf share/fcitx5/addon/quickphrase.conf share/fcitx5/addon/spell.conf share/fcitx5/addon/unicode.conf +share/fcitx5/addon/virtualkeyboard.conf share/fcitx5/addon/xcb.conf share/fcitx5/addon/xim.conf share/fcitx5/data/ @@ -432,10 +434,14 @@ share/fcitx5/testing/addon/testim.conf share/fcitx5/testing/addon/testui.conf share/fcitx5/themes/ share/fcitx5/themes/default/ +share/fcitx5/themes/default-dark/ +share/fcitx5/themes/default-dark/arrow.png +share/fcitx5/themes/default-dark/next.png +share/fcitx5/themes/default-dark/prev.png +share/fcitx5/themes/default-dark/radio.png +share/fcitx5/themes/default-dark/theme.conf share/fcitx5/themes/default/arrow.png -share/fcitx5/themes/default/highlight.png share/fcitx5/themes/default/next.png -share/fcitx5/themes/default/panel.png share/fcitx5/themes/default/prev.png share/fcitx5/themes/default/radio.png share/fcitx5/themes/default/theme.conf Index: inputmethods/fcitx/pkg/README =================================================================== RCS file: /home/cvs/ports/inputmethods/fcitx/pkg/README,v diff -u -p -r1.3 README --- inputmethods/fcitx/pkg/README 21 Jun 2022 10:35:49 -0000 1.3 +++ inputmethods/fcitx/pkg/README 19 Jan 2024 16:15:32 -0000 @@ -66,6 +66,10 @@ then select and add your preferred input Input Method panel. You might need to uncheck 'Only Show Current Language' to find your preferred input method. +If using KDE Plasma, you can also setup your input method via: + + System Settings -> Regional Settings -> Input Method + For more information, please refer to Fcitx's wiki page: https://www.fcitx-im.org/wiki/Setup_Fcitx_5 Index: inputmethods/libime/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/libime/Makefile,v diff -u -p -r1.7 Makefile --- inputmethods/libime/Makefile 28 Dec 2023 12:52:46 -0000 1.7 +++ inputmethods/libime/Makefile 19 Jan 2024 19:13:06 -0000 @@ -1,11 +1,10 @@ COMMENT = library to support generic input method implementation -DISTNAME = libime-1.0.17 -REVISION = 1 +DISTNAME = libime-1.1.5 -SHARED_LIBS += IMECore 0.0 # 0.0 -SHARED_LIBS += IMEPinyin 0.0 # 0.0 -SHARED_LIBS += IMETable 0.0 # 0.0 +SHARED_LIBS += IMECore 0.1 # 0.0 +SHARED_LIBS += IMEPinyin 0.1 # 0.0 +SHARED_LIBS += IMETable 1.0 # 0.0 CATEGORIES = inputmethods @@ -16,7 +15,7 @@ MAINTAINER = Yifei Zhan <open...@zhan.sc # LGPLv2.1+ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils boost_filesystem-mt -WANTLIB += boost_iostreams-mt boost_regex-mt c m +WANTLIB += boost_iostreams-mt boost_regex-mt c m zstd SITES = https://download.fcitx-im.org/fcitx5/libime/ @@ -25,8 +24,9 @@ SITES.data = https://download.fcitx-im. # 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-20220810.tar.xz -DISTFILES.data += lm_sc.arpa-20220810.tar.xz +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 EXTRACT_SUFX = .tar.xz @@ -47,9 +47,11 @@ RUN_DEPENDS = devel/desktop-file-utils LIB_DEPENDS = inputmethods/fcitx \ devel/boost post-patch: - @cp ${FULLDISTDIR}/dict-20220810.tar.xz \ + @cp ${FULLDISTDIR}/dict-20230412.tar.xz \ ${WRKSRC}/data/ - @cp ${FULLDISTDIR}/lm_sc.arpa-20220810.tar.xz \ + @cp ${FULLDISTDIR}/lm_sc.arpa-20230712.tar.xz \ + ${WRKSRC}/data/ + @cp ${FULLDISTDIR}/table-20240108.tar.gz \ ${WRKSRC}/data/ @cp ${FULLDISTDIR}/table.tar.gz \ ${WRKSRC}/data/ Index: inputmethods/libime/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/libime/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/libime/distinfo 20 Apr 2023 09:21:36 -0000 1.2 +++ inputmethods/libime/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,8 +1,10 @@ -SHA256 (fcitx/dict-20220810.tar.xz) = lxdS9BMYgAfo0ZFYwRuFyVXiXXsyHsInXEs69tioXSY= -SHA256 (fcitx/libime-1.0.17.tar.xz) = I/h7gQS5FhvcQfusRClP74JdWGJgr8aY9qhf8g6mVAc= -SHA256 (fcitx/lm_sc.arpa-20220810.tar.xz) = oRvJfSda2vGV+brIVDaK4GzbSg/h7s9Z21rlgGFdtPo= +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-20220810.tar.xz) = 1160888 -SIZE (fcitx/libime-1.0.17.tar.xz) = 415804 -SIZE (fcitx/lm_sc.arpa-20220810.tar.xz) = 21436544 +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 Index: inputmethods/libime/patches/patch-src_libime_core_CMakeLists_txt =================================================================== RCS file: /home/cvs/ports/inputmethods/libime/patches/patch-src_libime_core_CMakeLists_txt,v diff -u -p -r1.1 patch-src_libime_core_CMakeLists_txt --- inputmethods/libime/patches/patch-src_libime_core_CMakeLists_txt 28 Dec 2023 12:52:46 -0000 1.1 +++ inputmethods/libime/patches/patch-src_libime_core_CMakeLists_txt 19 Jan 2024 16:15:32 -0000 @@ -1,18 +0,0 @@ -Pull in upstream change to switch to C++11 to unbreak build - -https://github.com/fcitx/libime/commit/95c1433500b089b0c2edbdd17720f66e6eafd5e0 - -Index: src/libime/core/CMakeLists.txt ---- src/libime/core/CMakeLists.txt.orig -+++ src/libime/core/CMakeLists.txt -@@ -13,7 +13,9 @@ add_library(kenlm STATIC ${KENLM_SRCS}) - target_include_directories(kenlm PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/kenlm>) - target_compile_definitions(kenlm PUBLIC -DKENLM_MAX_ORDER=3 PRIVATE -DNDEBUG) - target_link_libraries(kenlm PUBLIC Boost::boost) --set_target_properties(kenlm PROPERTIES POSITION_INDEPENDENT_CODE ON) -+set_target_properties(kenlm PROPERTIES -+ CXX_STANDARD 11 -+ POSITION_INDEPENDENT_CODE ON) - - if(UNIX) - check_library_exists(rt clock_gettime "clock_gettime from librt" HAVE_CLOCKGETTIME_RT) Index: inputmethods/libime/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/inputmethods/libime/pkg/PLIST,v diff -u -p -r1.2 PLIST --- inputmethods/libime/pkg/PLIST 20 Apr 2023 09:21:36 -0000 1.2 +++ inputmethods/libime/pkg/PLIST 19 Jan 2024 16:15:32 -0000 @@ -33,6 +33,7 @@ include/LibIME/libime/pinyin/pinyinencod include/LibIME/libime/pinyin/pinyinime.h include/LibIME/libime/pinyin/pinyinmatchstate.h include/LibIME/libime/pinyin/pinyinmatchstate_p.h +include/LibIME/libime/pinyin/pinyinprediction.h include/LibIME/libime/pinyin/shuangpindata.h include/LibIME/libime/pinyin/shuangpinprofile.h include/LibIME/libime/table/ Index: inputmethods/xcb-imdkit/Makefile =================================================================== RCS file: /home/cvs/ports/inputmethods/xcb-imdkit/Makefile,v diff -u -p -r1.3 Makefile --- inputmethods/xcb-imdkit/Makefile 26 Sep 2023 11:43:24 -0000 1.3 +++ inputmethods/xcb-imdkit/Makefile 19 Jan 2024 16:15:32 -0000 @@ -1,6 +1,6 @@ COMMENT = implementation of xim protocol in xcb -DISTNAME = xcb-imdkit-1.0.5 +DISTNAME = xcb-imdkit-1.0.6 SHARED_LIBS += xcb-imdkit 1.0 # 1.0 Index: inputmethods/xcb-imdkit/distinfo =================================================================== RCS file: /home/cvs/ports/inputmethods/xcb-imdkit/distinfo,v diff -u -p -r1.2 distinfo --- inputmethods/xcb-imdkit/distinfo 20 Apr 2023 09:22:23 -0000 1.2 +++ inputmethods/xcb-imdkit/distinfo 19 Jan 2024 16:15:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (xcb-imdkit-1.0.5.tar.xz) = Nz/NJtmSVLEmD9AlS86h00bhBhzFcH9NcbSgkUGPA8w= -SIZE (xcb-imdkit-1.0.5.tar.xz) = 347460 +SHA256 (xcb-imdkit-1.0.6.tar.xz) = 7nE1P9jwSMHMhZFsx5rHrEQhkRCBAghfDcVQ150AUjA= +SIZE (xcb-imdkit-1.0.6.tar.xz) = 347508
