Try to update qtwayland to 6.6.0 again
This commit is contained in:
parent
27d9fa6acb
commit
a92e9f7162
|
@ -758,9 +758,7 @@ RUN git clone -b {{ QT_TAG }} --depth=1 https://code.qt.io/qt/qt5.git qt_{{ QT }
|
||||||
&& cd qtbase \
|
&& cd qtbase \
|
||||||
&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
|
&& find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
|
||||||
&& cd ../qtwayland \
|
&& cd ../qtwayland \
|
||||||
&& git fetch origin v6.5.3 \
|
&& git fetch origin aae65c885d8e38d8abc2959cded7b5e9e5fc88b3 \
|
||||||
&& git checkout FETCH_HEAD \
|
|
||||||
&& git fetch origin da4bb4885d91fad53a573bbeacf1b0705eb5b1a5 \
|
|
||||||
&& git cherry-pick -n FETCH_HEAD \
|
&& git cherry-pick -n FETCH_HEAD \
|
||||||
&& cd .. \
|
&& cd .. \
|
||||||
&& ./configure -prefix "{{ QT_PREFIX }}" \
|
&& ./configure -prefix "{{ QT_PREFIX }}" \
|
||||||
|
|
|
@ -489,9 +489,7 @@ parts:
|
||||||
git fetch origin v6.5.3
|
git fetch origin v6.5.3
|
||||||
git checkout FETCH_HEAD
|
git checkout FETCH_HEAD
|
||||||
cd ../qtwayland
|
cd ../qtwayland
|
||||||
git fetch origin v6.5.3
|
git fetch origin aae65c885d8e38d8abc2959cded7b5e9e5fc88b3
|
||||||
git checkout FETCH_HEAD
|
|
||||||
git fetch origin da4bb4885d91fad53a573bbeacf1b0705eb5b1a5
|
|
||||||
git cherry-pick -n FETCH_HEAD
|
git cherry-pick -n FETCH_HEAD
|
||||||
sed -i 's/qMin(version, 8)/qMin(version, 7)/' src/client/qwaylandinputdevice.cpp
|
sed -i 's/qMin(version, 8)/qMin(version, 7)/' src/client/qwaylandinputdevice.cpp
|
||||||
cd ..
|
cd ..
|
||||||
|
|
Loading…
Reference in New Issue