From 66ebf09a5c282b35ca4292a3eb2255ebbc008837 Mon Sep 17 00:00:00 2001 From: Yongxiang Liang Date: Tue, 21 Jul 2026 23:43:21 +0800 Subject: [PATCH] app-i18n/fcitx-qt: fix broken Qt5 deps after Qt5 removal Bug: https://bugs.gentoo.org/948836 Signed-off-by: Yongxiang Liang Part-of: https://github.com/gentoo/gentoo/pull/46601 Closes: https://github.com/gentoo/gentoo/pull/46601 Signed-off-by: Andreas Sturmlechner --- app-i18n/fcitx-qt/fcitx-qt-5.1.14.ebuild | 30 +++++++----------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/app-i18n/fcitx-qt/fcitx-qt-5.1.14.ebuild b/app-i18n/fcitx-qt/fcitx-qt-5.1.14.ebuild index 7bdac46fb6133..c73403363681c 100644 --- a/app-i18n/fcitx-qt/fcitx-qt-5.1.14.ebuild +++ b/app-i18n/fcitx-qt/fcitx-qt-5.1.14.ebuild @@ -10,34 +10,20 @@ inherit cmake dot-a unpacker DESCRIPTION="Qt library and IM module for fcitx5" HOMEPAGE="https://github.com/fcitx/fcitx5-qt" SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" - S="${WORKDIR}/${MY_PN}-${PV}" + LICENSE="BSD LGPL-2.1+" SLOT="5" KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" -IUSE="qt5 onlyplugin staticplugin +qt6 +X wayland" +IUSE="onlyplugin staticplugin wayland +X" REQUIRED_USE=" - || ( qt5 qt6 ) - qt5? ( X ) staticplugin? ( onlyplugin ) " RDEPEND=" - !onlyplugin? ( - >=app-i18n/fcitx-5.1.13:5 - qt5? ( dev-qt/qtconcurrent:5 ) - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5= - dev-qt/qtwidgets:5 - wayland? ( dev-qt/qtwayland:5 ) - ) - qt6? ( - dev-qt/qtbase:6=[dbus,gui,widgets,wayland?] - wayland? ( dev-qt/qtwayland:6 ) - ) + !onlyplugin? ( >=app-i18n/fcitx-5.1.13:5 ) + dev-qt/qtbase:6=[dbus,gui,widgets,wayland?] + wayland? ( dev-qt/qtwayland:6 ) X? ( x11-libs/libX11 x11-libs/libxcb @@ -55,9 +41,9 @@ src_configure() { use staticplugin && lto-guarantee-fat local mycmakeargs=( -DENABLE_QT4=no - -DENABLE_QT5=$(usex qt5) - -DENABLE_QT6=$(usex qt6) - -DENABLE_QT6_WAYLAND_WORKAROUND=$(usex qt6 $(usex wayland)) + -DENABLE_QT5=no + -DENABLE_QT6=yes + -DENABLE_QT6_WAYLAND_WORKAROUND=$(usex wayland) -DENABLE_X11=$(usex X) -DBUILD_ONLY_PLUGIN=$(usex onlyplugin) -DBUILD_STATIC_PLUGIN=$(usex staticplugin)