From 4e5e30a8ddd611de6aebbbe807b27e8e3eece446 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 1 Aug 2020 13:09:56 +0000 Subject: [PATCH] Update fcitx5-qt --- .github/workflows/linux.yml | 4 ++-- Telegram/ThirdParty/fcitx5-qt | 2 +- docs/building-cmake.md | 4 ++-- snap/snapcraft.yaml | 2 -- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7dfbce9a05..931a88c29b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -423,8 +423,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,qtx11extras - git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras + perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg + git submodule update qtbase qtwayland qtimageformats qtsvg cd qtbase find ../../patches/qtbase_${QT} -type f -print0 | sort -z | xargs -r0 git apply cd .. diff --git a/Telegram/ThirdParty/fcitx5-qt b/Telegram/ThirdParty/fcitx5-qt index b7bdd8aec2..47628ac9f8 160000 --- a/Telegram/ThirdParty/fcitx5-qt +++ b/Telegram/ThirdParty/fcitx5-qt @@ -1 +1 @@ -Subproject commit b7bdd8aec2dcb44dc792fedec89d67be0c527ca1 +Subproject commit 47628ac9f81b589d8e69f82b121d08773b06e813 diff --git a/docs/building-cmake.md b/docs/building-cmake.md index c3475c3fe5..7cd86d029a 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -236,9 +236,9 @@ Go to ***BuildPath*** and run git clone git://code.qt.io/qt/qt5.git qt_5_12_8 cd qt_5_12_8 - perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg,qtx11extras + perl init-repository --module-subset=qtbase,qtwayland,qtimageformats,qtsvg git checkout v5.12.8 - git submodule update qtbase qtwayland qtimageformats qtsvg qtx11extras + git submodule update qtbase qtwayland qtimageformats qtsvg cd qtbase find ../../patches/qtbase_5_12_8 -type f -print0 | sort -z | xargs -r0 git apply cd .. diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index cb2dae458e..69682630b1 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -77,7 +77,6 @@ parts: - libpulse-dev - libqt5svg5-dev - libqt5waylandclient5-dev - - libqt5x11extras5-dev - libssl-dev - libxcb1-dev - libxcb-screensaver0-dev @@ -92,7 +91,6 @@ parts: - libpulse0 - libqt5svg5 - libqt5waylandclient5 - - libqt5x11extras5 - libssl1.1 - libxcb1 - libxcb-screensaver0