From 701e1d7b4dcc7b5dff1dc913525618bb00f20dd2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 8 May 2020 16:03:16 +0400
Subject: [PATCH] Add fcitx5 support

---
 .github/workflows/linux.yml   | 4 ++--
 .gitmodules                   | 3 +++
 Telegram/CMakeLists.txt       | 4 ++--
 Telegram/ThirdParty/fcitx5-qt | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)
 create mode 160000 Telegram/ThirdParty/fcitx5-qt

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3403cdfb5d..42dd124052 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -415,8 +415,8 @@ jobs:
 
           git clone -b v5.12.8 --depth=1 git://code.qt.io/qt/qt5.git qt_${QT}
           cd qt_${QT}
-          perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg
-          git submodule update qtbase qtwayland qtimageformats qtsvg
+          perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qtx11extras
+          git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras
           cd qtbase
           git apply ../../patches/qtbase_${QT}.diff
           cd ../
diff --git a/.gitmodules b/.gitmodules
index d6809ae1c3..161f355818 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,6 @@
 [submodule "Telegram/ThirdParty/libqtxdg"]
 	path = Telegram/ThirdParty/libqtxdg
 	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
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 0a766efeef..35405679bc 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -90,7 +90,7 @@ if (LINUX)
         PRIVATE
             desktop-app::external_statusnotifieritem
             desktop-app::external_dbusmenu_qt
-            desktop-app::external_fcitx_qt5
+            desktop-app::external_fcitx5_qt5
             desktop-app::external_hime_qt
         )
     endif()
@@ -138,7 +138,7 @@ endif()
 
 if (DESKTOP_APP_USE_PACKAGED)
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-    find_package(Threads)
+    find_package(Threads REQUIRED)
 
     target_link_libraries(Telegram
     PRIVATE
diff --git a/Telegram/ThirdParty/fcitx5-qt b/Telegram/ThirdParty/fcitx5-qt
new file mode 160000
index 0000000000..7561f994a7
--- /dev/null
+++ b/Telegram/ThirdParty/fcitx5-qt
@@ -0,0 +1 @@
+Subproject commit 7561f994a79320a4940a1f95c884004c4dd178f4