kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Use native dialogs on wayland in appimage (#27)

Browse source
This commit is contained in:
ilya-fedin 2020-04-18 19:14:06 +04:00 • committed by GitHub
parent b08b0ee0c7
commit f9ac719014
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/appimage-release.yml vendored
View file

@ -473,7 +473,7 @@ jobs:
uses: actions/cache@v1 uses: actions/cache@v1
with: with:
path: ${{ env.LibrariesPath }}/qt-cache 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. - name: Qt 5.12.8 build.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
@ -486,6 +486,9 @@ jobs:
cd qtbase cd qtbase
git apply ../../../$REPO_NAME/Telegram/Patches/qtbase_${QT}_appimage.diff git apply ../../../$REPO_NAME/Telegram/Patches/qtbase_${QT}_appimage.diff
cd .. cd ..
cd qtwayland
git apply ../../../$REPO_NAME/Telegram/Patches/qtwayland_${QT}.diff
cd ..
./configure -prefix /usr/local \ ./configure -prefix /usr/local \
-release \ -release \

5
.github/workflows/appimage.yml vendored
View file

@ -480,7 +480,7 @@ jobs:
uses: actions/cache@v1 uses: actions/cache@v1
with: with:
path: ${{ env.LibrariesPath }}/qt-cache 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. - name: Qt 5.12.8 build.
if: steps.cache-qt.outputs.cache-hit != 'true' if: steps.cache-qt.outputs.cache-hit != 'true'
run: | run: |
@ -493,6 +493,9 @@ jobs:
cd qtbase cd qtbase
git apply ../../../$REPO_NAME/Telegram/Patches/qtbase_${QT}_appimage.diff git apply ../../../$REPO_NAME/Telegram/Patches/qtbase_${QT}_appimage.diff
cd .. cd ..
cd qtwayland
git apply ../../../$REPO_NAME/Telegram/Patches/qtwayland_${QT}.diff
cd ..
./configure -prefix /usr/local \ ./configure -prefix /usr/local \
-release \ -release \

19
Telegram/Patches/qtwayland_5_12_8.diff Normal file
View file

@ -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