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

Try to update qtwayland to 6.6.0 again

This commit is contained in:
Ilya Fedin 2023-11-17 22:00:42 +04:00 committed by John Preston
parent 27d9fa6acb
commit a92e9f7162
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View File

@ -758,9 +758,7 @@ RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }
&& cd qtbase \
&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
&& cd ../qtwayland \
&& git fetch origin v6.5.3 \
&& git checkout FETCH_HEAD \
&& git fetch origin da4bb4885d91fad53a573bbeacf1b0705eb5b1a5 \
&& git fetch origin aae65c885d8e38d8abc2959cded7b5e9e5fc88b3 \
&& git cherry-pick -n FETCH_HEAD \
&& cd .. \
&& ./configure -prefix "{{ QT_PREFIX }}" \

4
snap/snapcraft.yaml
View File

@ -489,9 +489,7 @@ parts:
git fetch origin v6.5.3
git checkout FETCH_HEAD
cd ../qtwayland
git fetch origin v6.5.3
git checkout FETCH_HEAD
git fetch origin da4bb4885d91fad53a573bbeacf1b0705eb5b1a5
git fetch origin aae65c885d8e38d8abc2959cded7b5e9e5fc88b3
git cherry-pick -n FETCH_HEAD
sed -i 's/qMin(version, 8)/qMin(version, 7)/' src/client/qwaylandinputdevice.cpp
cd ..