commit: 0e207efb77a723e6fe0e04edf056bda208fb4a61 Author: jinqiang zhang <peeweep <AT> 0x0 <DOT> ee> AuthorDate: Wed Oct 29 06:13:54 2025 +0000 Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> CommitDate: Wed Oct 29 10:24:17 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e207efb
app-i18n/fcitx-configtool: fix build with USE="-X" Closes: https://github.com/gentoo/gentoo/pull/44371 Signed-off-by: jinqiang zhang <peeweep <AT> 0x0.ee> Signed-off-by: Yixun Lan <dlan <AT> gentoo.org> app-i18n/fcitx-configtool/fcitx-configtool-5.1.11.ebuild | 5 ++++- .../files/fcitx-configtool-remove-unused-xkbfile.patch | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.11.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.11.ebuild index 5be3c8fa29c1..965fab477754 100644 --- a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.11.ebuild +++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.11.ebuild @@ -55,7 +55,10 @@ BDEPEND=" virtual/pkgconfig " -PATCHES=( "${FILESDIR}"/${PN}-make-x11-dependencies-optional.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-make-x11-dependencies-optional.patch + "${FILESDIR}"/${PN}-remove-unused-xkbfile.patch +) src_configure() { local mycmakeargs=( diff --git a/app-i18n/fcitx-configtool/files/fcitx-configtool-remove-unused-xkbfile.patch b/app-i18n/fcitx-configtool/files/fcitx-configtool-remove-unused-xkbfile.patch new file mode 100644 index 000000000000..2ba15e294b21 --- /dev/null +++ b/app-i18n/fcitx-configtool/files/fcitx-configtool-remove-unused-xkbfile.patch @@ -0,0 +1,14 @@ +xkbfile looks like an unused dependency, remove it to fix USE="-X" build + +diff --git a/src/lib/configlib/CMakeLists.txt b/src/lib/configlib/CMakeLists.txt +index 6c257c6..1c204d7 100644 +--- a/src/lib/configlib/CMakeLists.txt ++++ b/src/lib/configlib/CMakeLists.txt +@@ -19,6 +19,6 @@ target_include_directories(configlib INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMA + target_link_libraries(configlib + Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Gui Fcitx5Qt${QT_MAJOR_VERSION}::DBusAddons + Fcitx5::Core Fcitx5::Utils +- Fcitx5Qt${QT_MAJOR_VERSION}::WidgetsAddons PkgConfig::XkbFile ++ Fcitx5Qt${QT_MAJOR_VERSION}::WidgetsAddons + ) +
