From: Omar Polo Subject: Re: Batch update for fcitx and related pkgs + Note for KDE Plasma To: Yifei Zhan Cc: ports@openbsd.org, kevlo@kevlo.org, rafael@sizeofvoid.org Date: Fri, 19 Jan 2024 20:42:15 +0100 On 2024/01/18 15:07:29 +1100, Yifei Zhan 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 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 ) - 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