commit: e970de337bd3e85466e65231107abbc3f221eeb3 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 2 16:08:57 2026 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Tue Mar 3 11:43:25 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e970de33
app-i18n/fcitx-qt: drop 5.1.10-r1 Part-of: https://github.com/gentoo/gentoo/pull/45880 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-i18n/fcitx-qt/Manifest | 1 - app-i18n/fcitx-qt/fcitx-qt-5.1.10-r1.ebuild | 67 ---------------------- .../files/fcitx-qt-5.1.10-fix-cmake-for-qt6.patch | 44 -------------- 3 files changed, 112 deletions(-) diff --git a/app-i18n/fcitx-qt/Manifest b/app-i18n/fcitx-qt/Manifest index 3ed0f0836372..1e8e48ef9cec 100644 --- a/app-i18n/fcitx-qt/Manifest +++ b/app-i18n/fcitx-qt/Manifest @@ -1,2 +1 @@ -DIST fcitx-qt-5.1.10.tar.zst 128563 BLAKE2B ff30f086d7267cc0c00e438a0795560e4a175fecd31efb740b569370b9427869fa62633e33464bf042139b6d1eb844dc4f3e473ec8da31ead678bd2964876b90 SHA512 89ca4b70d573823a804e2c4749f1d12c047689aa57db7a4ce17dbfaff9ad82a52c3db476aa54442a027121767bbc2b4e4830fea19e49198a0fccbcd2c66a6867 DIST fcitx-qt-5.1.12.tar.zst 130569 BLAKE2B dd5d1b4b286b507c9b0c7bf6f269a9a1278550bfd31ee7995f122cc83626b8ead86d394c7a490c57b364d58c00d9a9574e994f27b6fb711a4876db8e8c37670e SHA512 c708d1c993ecbcb5b38f41e39269c880f7f8a720bc9ff62230d955e1ef8067c67db6a929c203a98fdee8a4f6e9ca19c6bb687230547c7a15ccf4adc9c6008e09 diff --git a/app-i18n/fcitx-qt/fcitx-qt-5.1.10-r1.ebuild b/app-i18n/fcitx-qt/fcitx-qt-5.1.10-r1.ebuild deleted file mode 100644 index 0d097465efc2..000000000000 --- a/app-i18n/fcitx-qt/fcitx-qt-5.1.10-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2023-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="fcitx5-qt" - -inherit cmake 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" -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 ) - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libxkbcommon - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - kde-frameworks/extra-cmake-modules:0 - virtual/pkgconfig - !onlyplugin? ( sys-devel/gettext ) -" - -PATCHES=( "${FILESDIR}"/${P}-fix-cmake-for-qt6.patch ) - -src_configure() { - local mycmakeargs=( - -DENABLE_QT4=no - -DENABLE_QT5=$(usex qt5) - -DENABLE_QT6=$(usex qt6) - -DENABLE_QT6_WAYLAND_WORKAROUND=$(usex qt6 $(usex wayland)) - -DENABLE_X11=$(usex X) - -DBUILD_ONLY_PLUGIN=$(usex onlyplugin) - -DBUILD_STATIC_PLUGIN=$(usex staticplugin) - ) - cmake_src_configure -} diff --git a/app-i18n/fcitx-qt/files/fcitx-qt-5.1.10-fix-cmake-for-qt6.patch b/app-i18n/fcitx-qt/files/fcitx-qt-5.1.10-fix-cmake-for-qt6.patch deleted file mode 100644 index efb6c779b30f..000000000000 --- a/app-i18n/fcitx-qt/files/fcitx-qt-5.1.10-fix-cmake-for-qt6.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://github.com/fcitx/fcitx5-qt/commit/46a07a85d191fd77a1efc39c8ed43d0cd87788d2 -https://github.com/fcitx/fcitx5-qt/commit/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71 -https://github.com/fcitx/fcitx5-qt/commit/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4 - -fix cmake for QT 6.10.0 RC - ---- a/qt6/CMakeLists.txt -+++ b/qt6/CMakeLists.txt -@@ -1,11 +1,20 @@ - --find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets) --find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private) -+set(QT6_REQUIRED_COMPONENTS Core Gui DBus Widgets) -+ - if (ENABLE_QT6_WAYLAND_WORKAROUND) -- find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private) -- find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED) -+ list(APPEND QT6_REQUIRED_COMPONENTS WaylandClient WaylandGlobalPrivate) -+endif() -+find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED COMPONENTS ${QT6_REQUIRED_COMPONENTS}) -+ -+if (NOT TARGET Qt6::GuiPrivate) -+ find_package(Qt6GuiPrivate CONFIG REQUIRED) - endif() - -+if (ENABLE_QT6_WAYLAND_WORKAROUND AND NOT TARGET Qt6::WaylandClientPrivate) -+ find_package(Qt6WaylandClientPrivate CONFIG REQUIRED) -+endif() -+ -+ - add_subdirectory(dbusaddons) - add_subdirectory(platforminputcontext) - ---- a/qt6/immodule-probing/CMakeLists.txt -+++ b/qt6/immodule-probing/CMakeLists.txt -@@ -1,5 +1,4 @@ - add_executable(fcitx5-qt6-immodule-probing main.cpp) --target_include_directories(fcitx5-qt6-immodule-probing PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS}) --target_link_libraries(fcitx5-qt6-immodule-probing Qt6::Gui) -+target_link_libraries(fcitx5-qt6-immodule-probing Qt6::Gui Qt6::GuiPrivate) - --install(TARGETS fcitx5-qt6-immodule-probing DESTINATION "${CMAKE_INSTALL_BINDIR}") -\ No newline at end of file -+install(TARGETS fcitx5-qt6-immodule-probing DESTINATION "${CMAKE_INSTALL_BINDIR}")
