Try to update qtwayland to 6.6.0 again

telegramdesktop · Nov 19, 2023 · a92e9f7 · a92e9f7
1 parent 27d9fa6
commit a92e9f7
Show file tree

Hide file tree

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

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