From 05f43cabdf5338c65b8ada00918296680c7b4593 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 6 Nov 2020 17:22:14 +0300 Subject: [PATCH] Beta version 2.4.9. - Fix crash in tray icon removing. (macOS only) --- 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/docker/centos_env/Dockerfile | 2 +- Telegram/build/version | 8 ++++---- changelog.txt | 4 ++++ docs/building-msvc.md | 4 ++-- docs/building-xcode.md | 4 ++-- 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index b18c7d93a..0318c74bd 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.4.9.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 57b01f04d..5cf4fdcb7 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,4,8,0 - PRODUCTVERSION 2,4,8,0 + FILEVERSION 2,4,9,0 + PRODUCTVERSION 2,4,9,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.4.8.0" + VALUE "FileVersion", "2.4.9.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.8.0" + VALUE "ProductVersion", "2.4.9.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index dc896ff0c..8be2c6186 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,4,8,0 - PRODUCTVERSION 2,4,8,0 + FILEVERSION 2,4,9,0 + PRODUCTVERSION 2,4,9,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.4.8.0" + VALUE "FileVersion", "2.4.9.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.8.0" + VALUE "ProductVersion", "2.4.9.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 839219172..4d81de3c5 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 = 2004008; -constexpr auto AppVersionStr = "2.4.8"; +constexpr auto AppVersion = 2004009; +constexpr auto AppVersionStr = "2.4.9"; constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index cbeaab8f3..90464e42b 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -27,7 +27,7 @@ WORKDIR $LibrariesPath FROM builder AS patches RUN git clone $GIT/desktop-app/patches.git -RUN cd patches && git checkout b00f25d +RUN cd patches && git checkout e052c49 FROM builder AS libffi RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git diff --git a/Telegram/build/version b/Telegram/build/version index 64d838527..ad3eafa56 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2004008 +AppVersion 2004009 AppVersionStrMajor 2.4 -AppVersionStrSmall 2.4.8 -AppVersionStr 2.4.8 +AppVersionStrSmall 2.4.9 +AppVersionStr 2.4.9 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 2.4.8.beta +AppVersionOriginal 2.4.9.beta diff --git a/changelog.txt b/changelog.txt index 1affa8cbe..f6702ef31 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.4.9 beta (06.11.20) + +- Fix crash in tray icon removing. (macOS only) + 2.4.8 beta (06.11.20) - Upgrade Qt to version 5.15.1. diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 92042d06b..0913e0e1d 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -33,7 +33,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 a77e4d5 + git checkout e052c49 cd ../ git clone https://chromium.googlesource.com/external/gyp cd gyp @@ -63,7 +63,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 a77e4d5 + git checkout e052c49 cd .. git clone https://github.com/desktop-app/lzma.git diff --git a/docs/building-xcode.md b/docs/building-xcode.md index d8c19f8c7..48dfc7d93 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -29,7 +29,7 @@ Go to ***BuildPath*** and run git clone https://github.com/desktop-app/patches.git cd patches - git checkout cdca495 + git checkout e052c49 cd ../ git clone https://chromium.googlesource.com/external/gyp git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git @@ -58,7 +58,7 @@ Go to ***BuildPath*** and run git clone https://github.com/desktop-app/patches.git cd patches - git checkout cdca495 + git checkout e052c49 cd .. git clone https://git.tukaani.org/xz.git