Update Qt 6.8.0-beta4 -> 6.8.0-rc1

telegramdesktop · Sep 26, 2024 · c813069 · c813069
1 parent 791efa9
commit c813069
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
@@ -2,7 +2,7 @@
 {%- 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_TAG = "v" ~ QT ~ "-beta4" -%}
+{%- set QT_TAG = "v" ~ QT ~ "-rc1" -%}
 {%- 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 5361159037f844567cfffbd98c90d48d052fb5d0 \
+	&& git fetch --depth=1 origin e47e7ed0d383b8ca5622a58a5ffa0c8d5f00651f \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 

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 8ffdeda56a
+    git checkout e47e7ed0d3
 """)
 
 stage('msys64', """
@@ -1629,7 +1629,7 @@ def runStages():
     make install
 """)
 else: # qt > '6'
-    branch = 'v$QT' + ('-lts-lgpl' if qt < '6.3' else '-beta4')
+    branch = 'v$QT' + ('-lts-lgpl' if qt < '6.3' else '-rc1')
     stage('qt_' + qt, """
     git clone -b """ + branch + """ https://github.com/qt/qt5.git qt_$QT
     cd qt_$QT

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -166,7 +166,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 5361159037f844567cfffbd98c90d48d052fb5d0
+    source-commit: e47e7ed0d383b8ca5622a58a5ffa0c8d5f00651f
     plugin: dump
     override-pull: |
       craftctl default
@@ -381,7 +381,7 @@ parts:
     override-pull: |
       QT=6.8.0
 
-      git clone -b v${QT}-beta4 --depth=1 https://github.com/qt/qt5.git .
+      git clone -b v${QT}-rc1 --depth=1 https://github.com/qt/qt5.git .
       git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
 
       cd qtbase