MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Downgrade qtwayland to 6.5.3

This commit is contained in:
Ilya Fedin 2023-10-06 14:20:24 +04:00 committed by John Preston
parent a5ec616382
commit 93fbad50bc
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -757,6 +757,11 @@ RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
&& 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 cherry-pick -n FETCH_HEAD \
&& cd .. \
&& ./configure -prefix "{{ QT_PREFIX }}" \
CMAKE_BUILD_TYPE=None \

4
snap/snapcraft.yaml
View File

@ -472,6 +472,10 @@ 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 cherry-pick -n FETCH_HEAD
sed -i 's/qMin(version, 8)/qMin(version, 7)/' src/client/qwaylandinputdevice.cpp
cd ..
override-build: |