Update Qt 6.8.0 -> 6.8.1

telegramdesktop · Dec 3, 2024 · 783570f · 783570f
1 parent b1e2a42
commit 783570f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
@@ -1,7 +1,7 @@
 {%- set GIT = "https://github.com" -%}
 {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
 {%- set GIT_UPDATE_M4 = "git submodule set-url m4 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 && git config -f .gitmodules submodule.m4.shallow true && git submodule init && git submodule update" -%}
-{%- set QT = "6.8.0" -%}
+{%- set QT = "6.8.1" -%}
 {%- set QT_TAG = "v" ~ QT -%}
 {%- set CFLAGS_DEBUG = "$CFLAGS -O0 -fno-lto -U_FORTIFY_SOURCE" -%}
 {%- set LibrariesPath = "/usr/src/Libraries" -%}
@@ -42,7 +42,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin {{ GIT }}/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 643b18c2be6424fc6f35a52891ed5a6a42502ac2 \
+	&& git fetch --depth=1 origin cf3b896e00c288143fce51862dbd9b1c86df1960 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
@@ -734,6 +734,7 @@ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git \
 	&& cmake -GNinja -B build . \
 		-DCMAKE_BUILD_TYPE=None \
 		-DBUILD_SHARED_LIBS=OFF \
+		-DQT_GENERATE_SBOM=OFF \
 		-DINPUT_libpng=qt \
 		-DINPUT_harfbuzz=qt \
 		-DINPUT_pcre=qt \

diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
@@ -457,7 +457,7 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 412f65c296
+    git checkout cf3b896e00
 """)
 
 stage('msys64', """
@@ -1692,6 +1692,7 @@ def runStages():
         -static ^
         -static-runtime ^
         -feature-c++20 ^
+        -no-sbom ^
         -openssl linked ^
         -system-webp ^
         -system-zlib ^

diff --git a/Telegram/build/qt_version.py b/Telegram/build/qt_version.py
@@ -6,7 +6,7 @@ def resolve(arch):
     elif sys.platform == 'win32':
         if arch == 'arm' or 'qt6' in sys.argv:
             print('Choosing Qt 6.')
-            os.environ['QT'] = '6.8.0'
+            os.environ['QT'] = '6.8.1'
         elif os.environ.get('QT') is None:
             print('Choosing Qt 5.')
             os.environ['QT'] = '5.15.15'

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -164,7 +164,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 643b18c2be6424fc6f35a52891ed5a6a42502ac2
+    source-commit: cf3b896e00c288143fce51862dbd9b1c86df1960
     plugin: dump
     override-pull: |
       craftctl default
@@ -377,7 +377,7 @@ parts:
       - mesa-vulkan-drivers
       - xkb-data
     override-pull: |
-      QT=6.8.0
+      QT=6.8.1
 
       git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
@@ -393,6 +393,7 @@ parts:
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr \
         -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR \
+        -DQT_GENERATE_SBOM=OFF \
         -DINPUT_openssl=linked
 
       cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT