On Sun, Jan 05, 2025 at 02:44:30PM +0000, Stuart Henderson wrote: > > On 2025/01/01 21:32, Kevin Lo wrote: > > On Tue, Dec 24, 2024 at 09:29:26AM +0000, Yifei Zhan wrote: > > > > > > 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. > > > > Thanks for your work. Quickly testing your patch, I noticed that installing > > inputmethods/fcitx-config-qt displayed an issue, while the rest of the ports > > had no problems. > > > > ===> Building package for fcitx-configtool-5.1.7 > > Create /usr/ports/packages/amd64/all/fcitx-configtool-5.1.7.tgz > > LIB_DEPENDS x11/qt5/qtx11extras not needed for inputmethods/fcitx-config-qt > > ? > > LIB_DEPENDS devel/kf6/kdeclarative not needed for > > inputmethods/fcitx-config-qt ? > > LIB_DEPENDS devel/kf5/plasma-framework not needed for > > inputmethods/fcitx-config-qt ? > > LIB_DEPENDS devel/kf5/kdeclarative not needed for > > inputmethods/fcitx-config-qt ? > > LIB_DEPENDS devel/kf5/ki18n not needed for inputmethods/fcitx-config-qt ? > > LIB_DEPENDS devel/kf5/kitemviews not needed for > > inputmethods/fcitx-config-qt ? > > LIB_DEPENDS x11/qt5/qtbase,-main not needed for > > inputmethods/fcitx-config-qt ? > > This means that there's no WANTLIB entry associated with the LIB_DEPENDS > entry, so the dependency is *not* recorded in the package.
It has been two weeks, and maintainer Yifei Zhan hasn't yet responded. Since fcitx-configtool doesn't allow Qt5 and Qt6 to coexist: https://github.com/fcitx/fcitx5-configtool/blob/master/CMakeLists.txt#L18 The following diff addresses the issue. If there are no objections, I'll commit all the updates for fcitx tomorrow, thanks. Index: inputmethods/fcitx-config-qt/Makefile =================================================================== RCS file: /cvs/ports/inputmethods/fcitx-config-qt/Makefile,v retrieving revision 1.5 diff -u -p -u -p -r1.5 Makefile --- inputmethods/fcitx-config-qt/Makefile 23 Jan 2024 08:15:02 -0000 1.5 +++ inputmethods/fcitx-config-qt/Makefile 20 Jan 2025 03:05:43 -0000 @@ -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,16 @@ MAINTAINER = Yifei Zhan <open...@zhan.sc # 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 Fcitx5Qt5DBusAddons +WANTLIB += Fcitx5Qt5WidgetsAddons Fcitx5Utils KF5ConfigCore KF5CoreAddons +WANTLIB += KF5Declarative KF5I18n KF5IconThemes KF5ItemViews KF5Package +WANTLIB += KF5Plasma KF5QuickAddons KF5Service KF5WidgetsAddons +WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Qml Qt5QmlModels +WANTLIB += Qt5Quick Qt5Widgets Qt5X11Extras X11 c m xkbcommon +WANTLIB += xkbfile SITES = https://download.fcitx-im.org/fcitx5/fcitx5-configtool/ -DIST_SUBDIR = fcitx +EXTRACT_SUFX = .tar.zst MODULES = devel/kf5 @@ -35,13 +35,13 @@ RUN_DEPENDS = devel/desktop-file-utils devel/kf5/kirigami2 \ misc/shared-mime-info -LIB_DEPENDS = inputmethods/fcitx-qt \ - x11/qt5/qtx11extras \ - devel/kf5/plasma-framework \ - devel/kf5/kdeclarative \ +LIB_DEPENDS = devel/kf5/kdeclarative \ devel/kf5/ki18n \ - devel/kf5/kitemviews + devel/kf5/kitemviews \ + devel/kf5/plasma-framework \ + inputmethods/fcitx-qt \ + x11/qt5/qtx11extras -CONFIGURE_ARGS = -DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/qt5/cmake +CONFIGURE_ARGS = -DUSE_QT6=OFF .include <bsd.port.mk> Index: inputmethods/fcitx-config-qt/distinfo =================================================================== RCS file: /cvs/ports/inputmethods/fcitx-config-qt/distinfo,v retrieving revision 1.3 diff -u -p -u -p -r1.3 distinfo --- inputmethods/fcitx-config-qt/distinfo 23 Jan 2024 08:15:02 -0000 1.3 +++ inputmethods/fcitx-config-qt/distinfo 20 Jan 2025 03:05:43 -0000 @@ -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
