From 43a5265e0ca1b64ddb7c3f31ffc5e8b90ad792a0 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 24 Jun 2021 17:57:09 +0400 Subject: [PATCH 1/7] Version 2.8. - Start video conferences from Voice Chats in any group. - Share your screen or video from your camera with up to 30 participants (limit to be increased soon). - Talk without video with an unlimited number of participants. - Create voice chats from the info page of any group where you are an admin. - Group video calls are supported natively on all devices, including iPads and laptops. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 6 +++--- Telegram/build/version | 12 ++++++------ changelog.txt | 8 ++++++++ 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index fb608fe1d..80d1a66a0 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.8.0.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index cffdb2fe1..69477701e 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,7,10,0 - PRODUCTVERSION 2,7,10,0 + FILEVERSION 2,8,0,0 + PRODUCTVERSION 2,8,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.7.10.0" + VALUE "FileVersion", "2.8.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.7.10.0" + VALUE "ProductVersion", "2.8.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 9c4998e52..c86358eb8 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,7,10,0 - PRODUCTVERSION 2,7,10,0 + FILEVERSION 2,8,0,0 + PRODUCTVERSION 2,8,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.7.10.0" + VALUE "FileVersion", "2.8.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.7.10.0" + VALUE "ProductVersion", "2.8.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 9f5d09d08..ab8a9aff6 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 2007010; -constexpr auto AppVersionStr = "2.7.10"; -constexpr auto AppBetaVersion = true; +constexpr auto AppVersion = 2008000; +constexpr auto AppVersionStr = "2.8"; +constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 690117d47..c9d537569 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2007010 -AppVersionStrMajor 2.7 -AppVersionStrSmall 2.7.10 -AppVersionStr 2.7.10 -BetaChannel 1 +AppVersion 2008000 +AppVersionStrMajor 2.8 +AppVersionStrSmall 2.8 +AppVersionStr 2.8.0 +BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.7.10.beta +AppVersionOriginal 2.8 diff --git a/changelog.txt b/changelog.txt index d7792af0d..4f2ce308d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +2.8 (24.06.21) + +- Start video conferences from Voice Chats in any group. +- Share your screen or video from your camera with up to 30 participants (limit to be increased soon). +- Talk without video with an unlimited number of participants. +- Create voice chats from the info page of any group where you are an admin. +- Group video calls are supported natively on all devices, including iPads and laptops. + 2.7.10 beta (22.06.21) - Added ability to mix together bold, italic and other formatting. From baca3047d4867d691a2ec76a65ee0c1d1227e78f Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 24 Jun 2021 18:39:29 +0400 Subject: [PATCH 2/7] Version 2.8: Fix build on Windows x64. --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 3ba5f8d46..c8fa5ef71 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 3ba5f8d46a9023705a76f5b860514d61cf23893e +Subproject commit c8fa5ef7149cabbef52411070fcc6d5bad96feae From 9afee2620aa2461123248f05cc748af5fd09a507 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 26 Jun 2021 08:20:37 +0300 Subject: [PATCH 3/7] Fix crash in vertical sliders. Regression was introduced in 90ff8ecd0f. --- Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp index ba11fc0f8..7181adb66 100644 --- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp +++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp @@ -268,7 +268,9 @@ void MediaSlider::paintEvent(QPaintEvent *e) { + (alwaysSeekSize / 2.) + value * (length - alwaysSeekSize)) : qRound(from + value * length); - const auto till = std::max(mid, qRound(from + receivedTill * length)); + const auto till = horizontal + ? mid + : std::max(mid, qRound(from + receivedTill * length)); const auto end = from + length; const auto activeFg = disabled ? _st.activeFgDisabled From 48d482006a9821d76b7c27c79e6d606d32aa8641 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 26 Jun 2021 12:33:18 +0300 Subject: [PATCH 4/7] Fix crash fix. --- Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp index 7181adb66..e74362b8b 100644 --- a/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp +++ b/Telegram/SourceFiles/ui/widgets/continuous_sliders.cpp @@ -269,8 +269,8 @@ void MediaSlider::paintEvent(QPaintEvent *e) { + value * (length - alwaysSeekSize)) : qRound(from + value * length); const auto till = horizontal - ? mid - : std::max(mid, qRound(from + receivedTill * length)); + ? std::max(mid, qRound(from + receivedTill * length)) + : mid; const auto end = from + length; const auto activeFg = disabled ? _st.activeFgDisabled From 27da6ee9eb448326a8e61ed1fad1160222f3b831 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 26 Jun 2021 13:00:16 +0300 Subject: [PATCH 5/7] Update patches revision in instructions. --- docs/building-msvc-x64.md | 4 ++-- docs/building-msvc.md | 4 ++-- docs/building-xcode.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/building-msvc-x64.md b/docs/building-msvc-x64.md index 527591de9..21d9973d7 100644 --- a/docs/building-msvc-x64.md +++ b/docs/building-msvc-x64.md @@ -34,7 +34,7 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** cd ThirdParty git clone https://github.com/desktop-app/patches.git cd patches - git checkout 41ead72 + git checkout 7f8a282 cd ../ git clone https://chromium.googlesource.com/external/gyp cd gyp @@ -65,7 +65,7 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** git clone https://github.com/desktop-app/patches.git cd patches - git checkout 41ead72 + git checkout 7f8a282 cd .. git clone https://github.com/desktop-app/lzma.git diff --git a/docs/building-msvc.md b/docs/building-msvc.md index ade6495c7..fb66aa1cc 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -34,7 +34,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** cd ThirdParty git clone https://github.com/desktop-app/patches.git cd patches - git checkout ad34925 + git checkout 7f8a282 cd ../ git clone https://chromium.googlesource.com/external/gyp cd gyp @@ -65,7 +65,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** git clone https://github.com/desktop-app/patches.git cd patches - git checkout ad34925 + git checkout 7f8a282 cd .. git clone https://github.com/desktop-app/lzma.git diff --git a/docs/building-xcode.md b/docs/building-xcode.md index a3854402a..284124cf1 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -268,8 +268,8 @@ Go to ***BuildPath*** and run cd ../../.. build/gyp_crashpad.py -Dmac_deployment_target=10.10 - ninja -C out/Debug - ninja -C out/Release + ninja -C out/Debug base crashpad_util crashpad_client crashpad_handler + ninja -C out/Release base crashpad_util crashpad_client crashpad_handler cd .. git clone git://code.qt.io/qt/qt5.git qt_5_15_2 From 14f25fc997506e2e1cd5d918826c931e6e82f820 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 26 Jun 2021 13:03:40 +0300 Subject: [PATCH 6/7] Version 2.8.1. - Fix crash in audio player volume slider. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 4 ++++ 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 80d1a66a0..e450b5af6 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.8.1.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 69477701e..9a3edda30 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,8,1,0 + PRODUCTVERSION 2,8,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.8.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.8.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index c86358eb8..a3602049b 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,8,0,0 - PRODUCTVERSION 2,8,0,0 + FILEVERSION 2,8,1,0 + PRODUCTVERSION 2,8,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.8.0.0" + VALUE "FileVersion", "2.8.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.8.0.0" + VALUE "ProductVersion", "2.8.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index ab8a9aff6..fdf8b6972 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 2008000; -constexpr auto AppVersionStr = "2.8"; +constexpr auto AppVersion = 2008001; +constexpr auto AppVersionStr = "2.8.1"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index c9d537569..00b5e08fa 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2008000 +AppVersion 2008001 AppVersionStrMajor 2.8 -AppVersionStrSmall 2.8 -AppVersionStr 2.8.0 +AppVersionStrSmall 2.8.1 +AppVersionStr 2.8.1 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.8 +AppVersionOriginal 2.8.1 diff --git a/changelog.txt b/changelog.txt index 4f2ce308d..93469a964 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.8.1 (26.06.21) + +- Fix crash in audio player volume slider. + 2.8 (24.06.21) - Start video conferences from Voice Chats in any group. From b8a3746558ca86583e4f6b2aafda7532a5cdd4b5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 26 Jun 2021 13:26:39 +0300 Subject: [PATCH 7/7] Version 2.8.1: Fix NuGet WinRT header generation. --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index c8fa5ef71..1d59503a2 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit c8fa5ef7149cabbef52411070fcc6d5bad96feae +Subproject commit 1d59503a24227ba1a8477d25c6fa33df0e38abd6