Skip to content

Commit

Permalink
chore(x11/fcitx5-qt): Replace workaround for qt plugin path with cmak…
Browse files Browse the repository at this point in the history
…e option

%ci:no-build
  • Loading branch information
Biswa96 committed Jan 25, 2025
1 parent c9c1a76 commit 4f97cca
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
7 changes: 1 addition & 6 deletions x11-packages/fcitx5-qt/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,10 @@ TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag"
TERMUX_PKG_DEPENDS="fcitx5, libc++, libx11, libxcb, libxkbcommon, qt6-qtbase"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-DCMAKE_INSTALL_QT6PLUGINDIR=lib/qt6/plugins
-DENABLE_TEST=OFF
-DENABLE_QT4=OFF
-DENABLE_QT5=OFF
-DENABLE_QT6=ON
-DENABLE_QT6_WAYLAND_WORKAROUND=OFF
"

termux_step_post_make_install() {
local _QT6_PLATFORM_INPUT_CONTEXTS_DIR=$TERMUX_PREFIX/lib/qt6/plugins/platforminputcontexts
mkdir -p "$_QT6_PLATFORM_INPUT_CONTEXTS_DIR"
mv $TERMUX_PREFIX/opt/qt6/cross/lib/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so $_QT6_PLATFORM_INPUT_CONTEXTS_DIR
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Allow setting CMAKE_INSTALL_QT6PLUGINDIR option from cmake command

--- a/qt6/platforminputcontext/CMakeLists.txt
+++ b/qt6/platforminputcontext/CMakeLists.txt
@@ -74,5 +74,7 @@
else()
message(FATAL_ERROR "QMake Qt6 call failed: ${return_code}")
endif()
+if(NOT CMAKE_INSTALL_QT6PLUGINDIR)
set(CMAKE_INSTALL_QT6PLUGINDIR ${_QT6PLUGINDIR} CACHE PATH "Qt6 plugin dir")
+endif()
install(TARGETS fcitx5platforminputcontextplugin-qt6 DESTINATION ${CMAKE_INSTALL_QT6PLUGINDIR}/platforminputcontexts)

0 comments on commit 4f97cca

Please sign in to comment.