Update Qt

6.10.0 -> 6.10.1
6.2.12 -> 6.2.13
5.15.17 -> 5.15.18
This commit is contained in:
Ilya Fedin
2025-11-20 14:08:07 +00:00
committed by John Preston
parent cf7ae1adf2
commit 08d6e8c7eb
4 changed files with 8 additions and 10 deletions

View File

@@ -91,7 +91,7 @@ FROM builder AS patches
RUN git init patches \
&& cd patches \
&& git remote add origin https://github.com/desktop-app/patches.git \
&& git fetch --depth=1 origin 0b68b11048987a68d31b2d8380d9b7c5116aa961 \
&& git fetch --depth=1 origin 859556cab51d17585ff76d3db62ff1c7502bc850 \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git
@@ -731,7 +731,7 @@ COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
COPY --link --from=openssl /usr/src/openssl-cache /
COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
ENV QT=6.10.0
ENV QT=6.10.1
RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
&& cd qt5 \
&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
@@ -747,7 +747,6 @@ RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
-DFEATURE_sanitize_address=ON \
{%- endif %}
-DQT_QPA_PLATFORMS="wayland;xcb" \
-DFEATURE_copy_file_range=OFF \
-DINPUT_libpng=qt \
-DINPUT_harfbuzz=qt \
-DINPUT_pcre=qt \

View File

@@ -456,7 +456,7 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout c91bf24dcdf814cc3a3a37e2cb980ccb95f0f39f
git checkout 859556cab51d17585ff76d3db62ff1c7502bc850
""")
stage('msys64', """

View File

@@ -2,12 +2,12 @@ import sys, os
def resolve(arch):
if sys.platform == 'darwin':
os.environ['QT'] = '6.2.12'
os.environ['QT'] = '6.2.13'
elif sys.platform == 'win32':
if arch == 'arm' or 'qt6' in sys.argv:
print('Choosing Qt 6.')
os.environ['QT'] = '6.10.0'
os.environ['QT'] = '6.10.1'
else:
print('Choosing Qt 5.')
os.environ['QT'] = '5.15.17'
os.environ['QT'] = '5.15.18'
return True

View File

@@ -122,7 +122,7 @@ parts:
patches:
source: https://github.com/desktop-app/patches.git
source-depth: 1
source-commit: 0b68b11048987a68d31b2d8380d9b7c5116aa961
source-commit: 859556cab51d17585ff76d3db62ff1c7502bc850
plugin: nil
override-pull: |
craftctl default
@@ -399,7 +399,7 @@ parts:
qt:
source: https://github.com/qt/qt5.git
source-depth: 1
source-tag: v6.10.0
source-tag: v6.10.1
source-submodules:
- qtbase
- qtdeclarative
@@ -432,7 +432,6 @@ parts:
- -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
- -DBUILD_SHARED_LIBS=OFF
- -DQT_QPA_PLATFORMS="wayland;xcb"
- -DFEATURE_copy_file_range=OFF
- -DFEATURE_eglfs=OFF
- -DINPUT_openssl=linked
override-pull: |