RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add fcitx5 support

This commit is contained in:
Ilya Fedin 2020-05-08 16:03:16 +04:00 committed by John Preston
parent 9cbe899688
commit 701e1d7b4d
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/linux.yml vendored
View File

@ -415,8 +415,8 @@ jobs:
git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT} git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
cd qt_${QT} cd qt_${QT}
perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qtx11extras
git submodule update qtbase qtwayland qtimageformats qtsvg git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras
cd qtbase cd qtbase
git apply ../../patches/qtbase_${QT}.diff git apply ../../patches/qtbase_${QT}.diff
cd ../ cd ../

3
.gitmodules vendored
View File

@ -91,3 +91,6 @@
[submodule "Telegram/ThirdParty/libqtxdg"] [submodule "Telegram/ThirdParty/libqtxdg"]
path = Telegram/ThirdParty/libqtxdg path = Telegram/ThirdParty/libqtxdg
url = https://github.com/lxqt/libqtxdg.git url = https://github.com/lxqt/libqtxdg.git
[submodule "Telegram/ThirdParty/fcitx5-qt"]
path = Telegram/ThirdParty/fcitx5-qt
url = https://github.com/fcitx/fcitx5-qt.git

4
Telegram/CMakeLists.txt
View File

@ -90,7 +90,7 @@ if (LINUX)
PRIVATE PRIVATE
desktop-app::external_statusnotifieritem desktop-app::external_statusnotifieritem
desktop-app::external_dbusmenu_qt desktop-app::external_dbusmenu_qt
desktop-app::external_fcitx_qt5 desktop-app::external_fcitx5_qt5
desktop-app::external_hime_qt desktop-app::external_hime_qt
) )
endif() endif()
@ -138,7 +138,7 @@ endif()
if (DESKTOP_APP_USE_PACKAGED) if (DESKTOP_APP_USE_PACKAGED)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_package(Threads) find_package(Threads REQUIRED)
target_link_libraries(Telegram target_link_libraries(Telegram
PRIVATE PRIVATE

1
Telegram/ThirdParty/fcitx5-qt vendored Submodule

@ -0,0 +1 @@
Subproject commit 7561f994a79320a4940a1f95c884004c4dd178f4