Downgrade qtwayland to 6.5.3

feccruz · Oct 7, 2023 · 93fbad5 · 93fbad5
1 parent a5ec616
commit 93fbad5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
@@ -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 \

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -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: |