From 6def067e984aeafef0487304d82446d97bf41678 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 4 Nov 2023 15:53:51 +0300
Subject: [PATCH] Updated Qt to 6.2.6 on macOS.
---
CMakeLists.txt | 2 +-
Telegram/build/prepare/prepare.py | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b0a772fd..954b9476f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,7 +61,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED)
if (WIN32)
set(qt_version 5.15.10)
elseif (APPLE)
- set(qt_version 6.2.5)
+ set(qt_version 6.2.6)
endif()
endif()
include(cmake/external/qt/package.cmake)
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index c39d9b3c3..e14f26265 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -418,7 +418,7 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
- git checkout 81a81ffb5a
+ git checkout f603f4f986
""")
stage('msys64', """
@@ -1381,14 +1381,14 @@ mac:
""")
if buildQt6:
- stage('qt_6_2_5', """
+ stage('qt_6_2_6', """
mac:
- git clone -b v6.2.5-lts-lgpl https://code.qt.io/qt/qt5.git qt_6_2_5
- cd qt_6_2_5
+ git clone -b v6.2.6-lts-lgpl https://code.qt.io/qt/qt5.git qt_6_2_6
+ cd qt_6_2_6
perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
-depends:patches/qtbase_6.2.5/*.patch
+depends:patches/qtbase_6.2.6/*.patch
cd qtbase
- find ../../patches/qtbase_6.2.5 -type f -print0 | sort -z | xargs -0 git apply
+ find ../../patches/qtbase_6.2.6 -type f -print0 | sort -z | xargs -0 git apply -v
cd ..
sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml
@@ -1396,7 +1396,7 @@ depends:patches/qtbase_6.2.5/*.patch
release:
CONFIGURATIONS=-debug-and-release
mac:
- ./configure -prefix "$USED_PREFIX/Qt-6.2.5" \
+ ./configure -prefix "$USED_PREFIX/Qt-6.2.6" \
$CONFIGURATIONS \
-force-debug-info \
-opensource \