From: Rafael Sadowski Subject: Remove Qt5 support inputmethods/fcitx and firends To: ports@openbsd.org Cc: Yifei Zhan Date: Sun, 14 Jun 2026 19:28:23 +0200 I started with a simple devel/kf5 => devel/kf6/extra-cmake-modules replacement and ended up with removing Qt5 support. Any objections? diff --git a/inputmethods/fcitx-anthy/Makefile b/inputmethods/fcitx-anthy/Makefile index 056c1a3f231..92c6d2b57f6 100644 --- a/inputmethods/fcitx-anthy/Makefile +++ b/inputmethods/fcitx-anthy/Makefile @@ -2,7 +2,7 @@ COMMENT = anthy wrapper for fcitx5 DISTNAME = fcitx5-anthy-5.1.5 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVISION = 1 CATEGORIES = inputmethods japanese @@ -17,10 +17,10 @@ PERMIT_PACKAGE= Yes SITES = https://download.fcitx-im.org/fcitx5/fcitx5-anthy/ EXTRACT_SUFX = .tar.zst -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx \ devel/iso-codes diff --git a/inputmethods/fcitx-chewing/Makefile b/inputmethods/fcitx-chewing/Makefile index def05155e0f..8ded8839b87 100644 --- a/inputmethods/fcitx-chewing/Makefile +++ b/inputmethods/fcitx-chewing/Makefile @@ -3,7 +3,7 @@ COMMENT = chewing wrapper for fcitx5 DISTNAME = fcitx5-chewing-5.1.6 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} CATEGORIES = inputmethods chinese -REVISION = 0 +REVISION = 1 HOMEPAGE = https://github.com/fcitx/fcitx5-chewing @@ -16,10 +16,10 @@ WANTLIB += chewing m SITES = https://download.fcitx-im.org/fcitx5/fcitx5-chewing/ EXTRACT_SUFX = .tar.zst -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx \ devel/iso-codes diff --git a/inputmethods/fcitx-chinese-addons/Makefile b/inputmethods/fcitx-chinese-addons/Makefile index 000b4e3b2f2..d87b6e5f4ef 100644 --- a/inputmethods/fcitx-chinese-addons/Makefile +++ b/inputmethods/fcitx-chinese-addons/Makefile @@ -2,7 +2,7 @@ COMMENT = addons related to Chinese with IME bundled inside fcitx DISTNAME = fcitx5-chinese-addons-5.1.7 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 2 +REVISION = 3 CATEGORIES = inputmethods chinese @@ -23,9 +23,10 @@ SITES.py = https://download.fcitx-im.org/data/ DISTFILES.py += py_table-20121124.tar.gz DISTFILES.py += py_stroke-20121124.tar.gz -MODULES = devel/kf5 +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx-lua \ devel/fmt \ devel/iso-codes diff --git a/inputmethods/fcitx-config-qt/Makefile b/inputmethods/fcitx-config-qt/Makefile index deae380c2c3..999157695f5 100644 --- a/inputmethods/fcitx-config-qt/Makefile +++ b/inputmethods/fcitx-config-qt/Makefile @@ -2,7 +2,7 @@ COMMENT = GUI configure tool for fcitx5 DISTNAME = fcitx5-configtool-5.1.7 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVSION = 1 CATEGORIES = inputmethods @@ -11,36 +11,42 @@ HOMEPAGE = https://github.com/fcitx/fcitx5-configtool # GPLv2.0+ PERMIT_PACKAGE= Yes -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 +WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt6DBusAddons +WANTLIB += Fcitx5Qt6WidgetsAddons Fcitx5Utils GL KF6ConfigCore +WANTLIB += KF6CoreAddons KF6I18n KF6IconThemes KF6ItemViews KF6KCMUtilsCore +WANTLIB += KF6KCMUtilsQuick KF6Svg KF6WidgetsAddons KirigamiPlatform +WANTLIB += Plasma Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6OpenGL +WANTLIB += Qt6Qml Qt6Quick Qt6Widgets X11 c m xkbcommon xkbfile SITES = https://download.fcitx-im.org/fcitx5/fcitx5-configtool/ EXTRACT_SUFX = .tar.zst -MODULES = devel/kf5 +MODULES = devel/cmake x11/qt6 -BUILD_DEPENDS = devel/gettext,-tools \ - devel/kf5/kirigami2 \ - devel/kf5/kpackage \ - x11/qt5/qtquickcontrols2,-main \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ + devel/kf6/kpackage \ devel/iso-codes RUN_DEPENDS = devel/desktop-file-utils \ - devel/kf5/kirigami2 \ + devel/kf6/kdeclarative \ misc/shared-mime-info -LIB_DEPENDS = devel/kf5/kdeclarative \ - devel/kf5/ki18n \ - devel/kf5/kitemviews \ - devel/kf5/plasma-framework \ +LIB_DEPENDS = devel/kf6/kcmutils \ + devel/kf6/kconfig \ + devel/kf6/kcoreaddons \ + devel/kf6/ki18n \ + devel/kf6/kiconthemes \ + devel/kf6/kitemviews \ + devel/kf6/ksvg \ + devel/kf6/kwidgetsaddons \ + devel/kf6/kirigami \ inputmethods/fcitx-qt \ - x11/qt5/qtx11extras + x11/kde-plasma/libplasma \ + x11/qt6/qtdeclarative \ + x11/xkbcommon -CONFIGURE_ARGS = -DUSE_QT6=OFF +CONFIGURE_ARGS = -DUSE_QT5=OFF +CONFIGURE_ARGS = -DUSE_QT6=ON .include diff --git a/inputmethods/fcitx-config-qt/pkg/PLIST b/inputmethods/fcitx-config-qt/pkg/PLIST index 9171fe51181..2cb05871be2 100644 --- a/inputmethods/fcitx-config-qt/pkg/PLIST +++ b/inputmethods/fcitx-config-qt/pkg/PLIST @@ -1,35 +1,15 @@ @bin bin/fcitx5-config-qt @bin bin/fcitx5-plasma-theme-generator @bin bin/kbd-layout-viewer5 -@so lib/qt5/plugins/plasma/kcms/systemsettings/kcm_fcitx5.so +lib/qt6/ +lib/qt6/plugins/ +lib/qt6/plugins/plasma/ +lib/qt6/plugins/plasma/kcms/ +lib/qt6/plugins/plasma/kcms/systemsettings/ +@so lib/qt6/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 a/inputmethods/fcitx-gtk/Makefile b/inputmethods/fcitx-gtk/Makefile index 8f7fdcf3c66..72a31357855 100644 --- a/inputmethods/fcitx-gtk/Makefile +++ b/inputmethods/fcitx-gtk/Makefile @@ -2,7 +2,7 @@ COMMENT = GTK IM module for fcitx5 DISTNAME = fcitx5-gtk-5.1.3 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVISION = 1 SHARED_LIBS = Fcitx5GClient 0.0 # 0.0 @@ -21,10 +21,10 @@ WANTLIB += vulkan xkbcommon SITES = https://download.fcitx-im.org/fcitx5/fcitx5-gtk/ EXTRACT_SUFX = .tar.zst -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx \ devel/gobject-introspection \ devel/iso-codes diff --git a/inputmethods/fcitx-hangul/Makefile b/inputmethods/fcitx-hangul/Makefile index 1e7c4f6b754..3496fa250ac 100644 --- a/inputmethods/fcitx-hangul/Makefile +++ b/inputmethods/fcitx-hangul/Makefile @@ -2,7 +2,7 @@ COMMENT = Hangul wrapper for fcitx5 DISTNAME = fcitx5-hangul-5.1.5 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 1 +REVISION = 2 CATEGORIES = inputmethods korean @@ -17,10 +17,10 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils WANTLIB += hangul iconv intl m -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx \ devel/iso-codes diff --git a/inputmethods/fcitx-kkc/Makefile b/inputmethods/fcitx-kkc/Makefile index 57648a014ab..46928705b07 100644 --- a/inputmethods/fcitx-kkc/Makefile +++ b/inputmethods/fcitx-kkc/Makefile @@ -2,7 +2,7 @@ COMMENT = libkkc wrapper for fcitx5 DISTNAME = fcitx5-kkc-5.1.5 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVISION = 1 CATEGORIES = inputmethods japanese @@ -18,9 +18,10 @@ 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 +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx \ devel/iso-codes diff --git a/inputmethods/fcitx-lua/Makefile b/inputmethods/fcitx-lua/Makefile index d790847c841..354018b7fe4 100644 --- a/inputmethods/fcitx-lua/Makefile +++ b/inputmethods/fcitx-lua/Makefile @@ -2,7 +2,7 @@ COMMENT = Lua support for fcitx5 DISTNAME = fcitx5-lua-5.0.13 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVISION = 1 CATEGORIES = inputmethods @@ -17,10 +17,10 @@ EXTRACT_SUFX = .tar.zst WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils WANTLIB += m -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ lang/lua/5.3 \ devel/iso-codes diff --git a/inputmethods/fcitx-m17n/Makefile b/inputmethods/fcitx-m17n/Makefile index d71357bc8be..c294d4b82ee 100644 --- a/inputmethods/fcitx-m17n/Makefile +++ b/inputmethods/fcitx-m17n/Makefile @@ -2,7 +2,7 @@ COMMENT = m17n wrapper for fcitx5 DISTNAME = fcitx5-m17n-5.1.2 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVISION = 1 CATEGORIES = inputmethods @@ -17,10 +17,10 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils WANTLIB += m m17n m17n-core m17n-gui -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx \ devel/fmt \ devel/iso-codes diff --git a/inputmethods/fcitx-qt/Makefile b/inputmethods/fcitx-qt/Makefile index c95219c1437..66bc343a242 100644 --- a/inputmethods/fcitx-qt/Makefile +++ b/inputmethods/fcitx-qt/Makefile @@ -1,11 +1,9 @@ COMMENT = Qt library and IM module for fcitx5 -DISTNAME = fcitx5-qt-5.1.8 +DISTNAME = fcitx5-qt-5.1.9 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 2 +REVISION = 3 -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 @@ -17,18 +15,17 @@ HOMEPAGE = https://fcitx-im.org/ # LGPL2.1+ for other files PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils GL Qt5Concurrent Qt5Core -WANTLIB += Qt5DBus Qt5Gui Qt5Widgets Qt6Concurrent Qt6Core Qt6DBus -WANTLIB += Qt6Gui Qt6WaylandClient Qt6Widgets c m wayland-client +WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils GL Qt6Concurrent Qt6Core +WANTLIB += Qt6DBus 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 +MODULES = devel/cmake x11/qt6 -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ inputmethods/fcitx \ devel/iso-codes \ devel/fmt @@ -37,9 +34,12 @@ RUN_DEPENDS = devel/desktop-file-utils \ inputmethods/fcitx \ misc/shared-mime-info -LIB_DEPENDS = inputmethods/fcitx +LIB_DEPENDS = inputmethods/fcitx \ + wayland/wayland \ + x11/xkbcommon CONFIGURE_ARGS = -DENABLE_QT4=OFF \ + -DENABLE_QT5=OFF \ -DENABLE_QT6=ON .include diff --git a/inputmethods/fcitx-qt/distinfo b/inputmethods/fcitx-qt/distinfo index ec259b9e23f..c4332fb8d64 100644 --- a/inputmethods/fcitx-qt/distinfo +++ b/inputmethods/fcitx-qt/distinfo @@ -1,2 +1,2 @@ -SHA256 (fcitx5-qt-5.1.8.tar.zst) = /jRFUJ32Kt6OULhTPMKzp1njHEfs206LszjypjMCA3Y= -SIZE (fcitx5-qt-5.1.8.tar.zst) = 128800 +SHA256 (fcitx5-qt-5.1.9.tar.zst) = MVRUFjAKgL9SPyygSu64QF4tNe9wrF/CLVoC6r2Pheg= +SIZE (fcitx5-qt-5.1.9.tar.zst) = 128804 diff --git a/inputmethods/fcitx-qt/pkg/PLIST b/inputmethods/fcitx-qt/pkg/PLIST index a188daabc8d..47ff84c693a 100644 --- a/inputmethods/fcitx-qt/pkg/PLIST +++ b/inputmethods/fcitx-qt/pkg/PLIST @@ -1,22 +1,4 @@ -@bin bin/fcitx5-qt5-immodule-probing @bin bin/fcitx5-qt6-immodule-probing -include/Fcitx5Qt5/ -include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/ -include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/fcitx5qt5dbusaddons_export.h -include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/fcitxqtcontrollerproxy.h -include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/fcitxqtdbustypes.h -include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/fcitxqtinputcontextproxy.h -include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/fcitxqtinputmethodproxy.h -include/Fcitx5Qt5/Fcitx5Qt5DBusAddons/fcitxqtwatcher.h -include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/ -include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/fcitx5qt5widgetsaddons_export.h -include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/fcitxqtconfiguifactory.h -include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/fcitxqtconfiguiplugin.h -include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/fcitxqtconfiguiwidget.h -include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/fcitxqti18nhelper.h -include/Fcitx5Qt5/Fcitx5QtWidgetsAddons/fcitxqtkeysequencewidget.h -include/Fcitx5Qt5/fcitx5qt5dbusaddons_version.h -include/Fcitx5Qt5/fcitx5qt5widgetsaddons_version.h include/Fcitx5Qt6/ include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/ include/Fcitx5Qt6/Fcitx5Qt6DBusAddons/fcitx5qt6dbusaddons_export.h @@ -34,16 +16,6 @@ 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 -lib/cmake/Fcitx5Qt5DBusAddons/Fcitx5Qt5DBusAddonsTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/Fcitx5Qt5DBusAddons/Fcitx5Qt5DBusAddonsTargets.cmake -lib/cmake/Fcitx5Qt5WidgetsAddons/ -lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Qt5WidgetsAddonsConfig.cmake -lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Qt5WidgetsAddonsConfigVersion.cmake -lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Qt5WidgetsAddonsTargets${MODCMAKE_BUILD_SUFFIX} -lib/cmake/Fcitx5Qt5WidgetsAddons/Fcitx5Qt5WidgetsAddonsTargets.cmake lib/cmake/Fcitx5Qt6DBusAddons/ lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsConfig.cmake lib/cmake/Fcitx5Qt6DBusAddons/Fcitx5Qt6DBusAddonsConfigVersion.cmake @@ -54,19 +26,12 @@ 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} -@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 diff --git a/inputmethods/fcitx-table-extra/Makefile b/inputmethods/fcitx-table-extra/Makefile index 4f3ff1674fe..b62233b99bb 100644 --- a/inputmethods/fcitx-table-extra/Makefile +++ b/inputmethods/fcitx-table-extra/Makefile @@ -2,7 +2,7 @@ COMMENT = extra table for Fcitx5 DISTNAME = fcitx5-table-extra-5.1.6 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 1 +REVISION = 2 CATEGORIES = inputmethods chinese @@ -14,9 +14,10 @@ PERMIT_PACKAGE= Yes SITES = https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/ EXTRACT_SUFX = .tar.zst -MODULES = devel/kf5 +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ devel/iso-codes RUN_DEPENDS = devel/desktop-file-utils \ diff --git a/inputmethods/fcitx-unikey/Makefile b/inputmethods/fcitx-unikey/Makefile index 955b40fade9..0b06a10dc7d 100644 --- a/inputmethods/fcitx-unikey/Makefile +++ b/inputmethods/fcitx-unikey/Makefile @@ -2,7 +2,7 @@ COMMENT = unikey Vietnamese support for fcitx5 DISTNAME = fcitx5-unikey-5.1.5 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVISION = 1 CATEGORIES = inputmethods @@ -17,10 +17,10 @@ PERMIT_PACKAGE= Yes WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt6WidgetsAddons WANTLIB += Fcitx5Utils GL Qt6Core Qt6Gui Qt6Widgets m -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ devel/iso-codes RUN_DEPENDS = devel/desktop-file-utils \ diff --git a/inputmethods/fcitx/Makefile b/inputmethods/fcitx/Makefile index 2aa2140c906..233732c5c66 100644 --- a/inputmethods/fcitx/Makefile +++ b/inputmethods/fcitx/Makefile @@ -2,7 +2,7 @@ COMMENT = flexible input method framework DISTNAME = fcitx5-5.1.11 PKGNAME = ${DISTNAME:S/fcitx5/fcitx/} -REVISION = 0 +REVISION = 1 SHARED_LIBS += Fcitx5Config 0.0 # 0.0 SHARED_LIBS += Fcitx5Core 1.1 # 0.0 @@ -29,10 +29,10 @@ DISTFILES.data= en_dict-20121020.tar.gz EXTRACT_SUFX = .tar.zst -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/gettext,-tools \ devel/iso-codes \ devel/fmt diff --git a/inputmethods/libime/Makefile b/inputmethods/libime/Makefile index d7026b7518a..43cf088c05e 100644 --- a/inputmethods/libime/Makefile +++ b/inputmethods/libime/Makefile @@ -1,7 +1,7 @@ COMMENT = library to support generic input method implementation DISTNAME = libime-1.1.9 -REVISION = 4 +REVISION = 5 SHARED_LIBS += IMECore 0.2 # 0.0 SHARED_LIBS += IMEPinyin 0.2 # 0.0 @@ -33,10 +33,9 @@ EXTRACT_SUFX = .tar.zst COMPILER = base-clang ports-gcc -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/gettext,-tools \ +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ devel/boost \ devel/iso-codes diff --git a/inputmethods/xcb-imdkit/Makefile b/inputmethods/xcb-imdkit/Makefile index 937fbd2f21b..8e6d2deb766 100644 --- a/inputmethods/xcb-imdkit/Makefile +++ b/inputmethods/xcb-imdkit/Makefile @@ -1,7 +1,7 @@ COMMENT = implementation of xim protocol in xcb DISTNAME = xcb-imdkit-1.0.9 -REVISION = 1 +REVISION = 2 SHARED_LIBS += xcb-imdkit 2.0 # 2.0 @@ -21,10 +21,10 @@ EXTRACT_SUFX = .tar.zst COMPILER = base-clang ports-gcc COMPILER_LANGS = c -MODULES = devel/kf5 -MODQT5_DEPS = No +MODULES = devel/cmake -BUILD_DEPENDS = devel/uthash +BUILD_DEPENDS = devel/kf6/extra-cmake-modules \ + devel/uthash CFLAGS += -I${LOCALBASE}/include