diff --git a/.github/workflows/appimage-release.yml b/.github/workflows/appimage-release.yml index 58f8fbf87..689d0eb76 100644 --- a/.github/workflows/appimage-release.yml +++ b/.github/workflows/appimage-release.yml @@ -473,7 +473,7 @@ jobs: uses: actions/cache@v1 with: path: ${{ env.LibrariesPath }}/qt-cache - key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8_appimage.diff') }} + key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8_appimage.diff') }}-${{ hashFiles('**/qtwayland_5_12_8.diff') }} - name: Qt 5.12.8 build. if: steps.cache-qt.outputs.cache-hit != 'true' run: | @@ -486,6 +486,9 @@ jobs: cd qtbase git apply ../../../$REPO_NAME/Telegram/Patches/qtbase_${QT}_appimage.diff cd .. + cd qtwayland + git apply ../../../$REPO_NAME/Telegram/Patches/qtwayland_${QT}.diff + cd .. ./configure -prefix /usr/local \ -release \ diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 62ae8ef4e..439879323 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -480,7 +480,7 @@ jobs: uses: actions/cache@v1 with: path: ${{ env.LibrariesPath }}/qt-cache - key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8_appimage.diff') }} + key: ${{ runner.OS }}-qt-${{ env.CACHE_KEY }}-${{ hashFiles('**/qtbase_5_12_8_appimage.diff') }}-${{ hashFiles('**/qtwayland_5_12_8.diff') }} - name: Qt 5.12.8 build. if: steps.cache-qt.outputs.cache-hit != 'true' run: | @@ -493,6 +493,9 @@ jobs: cd qtbase git apply ../../../$REPO_NAME/Telegram/Patches/qtbase_${QT}_appimage.diff cd .. + cd qtwayland + git apply ../../../$REPO_NAME/Telegram/Patches/qtwayland_${QT}.diff + cd .. ./configure -prefix /usr/local \ -release \ diff --git a/Telegram/Patches/qtwayland_5_12_8.diff b/Telegram/Patches/qtwayland_5_12_8.diff new file mode 100644 index 000000000..98b5d1257 --- /dev/null +++ b/Telegram/Patches/qtwayland_5_12_8.diff @@ -0,0 +1,19 @@ +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp +index 46bef294..845bb038 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -293,12 +293,12 @@ QWaylandDisplay *QWaylandIntegration::display() const + + QStringList QWaylandIntegration::themeNames() const + { +- return GenericWaylandTheme::themeNames(); ++ return QGenericUnixTheme::themeNames(); + } + + QPlatformTheme *QWaylandIntegration::createPlatformTheme(const QString &name) const + { +- return GenericWaylandTheme::createUnixTheme(name); ++ return QGenericUnixTheme::createUnixTheme(name); + } + + // May be called from non-GUI threads