MrBesen/tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Beta version 2.4.9.

Browse Source 
- Fix crash in tray icon removing. (macOS only)
This commit is contained in:
John Preston 2020-11-06 17:22:14 +03:00
parent 65ba81f504
commit 05f43cabdf
9 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/uwp/AppX/AppxManifest.xml
View File

@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop" <Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE" ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A" Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="2.4.8.0" /> Version="2.4.9.0" />
<Properties> <Properties>
<DisplayName>Telegram Desktop</DisplayName> <DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName> <PublisherDisplayName>Telegram FZ-LLC</PublisherDisplayName>

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,8,0 FILEVERSION 2,4,9,0
PRODUCTVERSION 2,4,8,0 PRODUCTVERSION 2,4,9,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -62,10 +62,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram FZ-LLC" VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop" VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "2.4.8.0" VALUE "FileVersion", "2.4.9.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.4.8.0" VALUE "ProductVersion", "2.4.9.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,8,0 FILEVERSION 2,4,9,0
PRODUCTVERSION 2,4,8,0 PRODUCTVERSION 2,4,9,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -53,10 +53,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram FZ-LLC" VALUE "CompanyName", "Telegram FZ-LLC"
VALUE "FileDescription", "Telegram Desktop Updater" VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "2.4.8.0" VALUE "FileVersion", "2.4.9.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "LegalCopyright", "Copyright (C) 2014-2020"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "2.4.8.0" VALUE "ProductVersion", "2.4.9.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

4
Telegram/SourceFiles/core/version.h
View File

@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppName = "Telegram Desktop"_cs;
constexpr auto AppFile = "Telegram"_cs; constexpr auto AppFile = "Telegram"_cs;
constexpr auto AppVersion = 2004008; constexpr auto AppVersion = 2004009;
constexpr auto AppVersionStr = "2.4.8"; constexpr auto AppVersionStr = "2.4.9";
constexpr auto AppBetaVersion = true; constexpr auto AppBetaVersion = true;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

2
Telegram/build/docker/centos_env/Dockerfile
View File

@ -27,7 +27,7 @@ WORKDIR $LibrariesPath
FROM builder AS patches FROM builder AS patches
RUN git clone $GIT/desktop-app/patches.git RUN git clone $GIT/desktop-app/patches.git
RUN cd patches && git checkout b00f25d RUN cd patches && git checkout e052c49
FROM builder AS libffi FROM builder AS libffi
RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git RUN git clone -b v3.3 --depth=1 $GIT/libffi/libffi.git

8
Telegram/build/version
View File

@ -1,7 +1,7 @@
AppVersion 2004008 AppVersion 2004009
AppVersionStrMajor 2.4 AppVersionStrMajor 2.4
AppVersionStrSmall 2.4.8 AppVersionStrSmall 2.4.9
AppVersionStr 2.4.8 AppVersionStr 2.4.9
BetaChannel 1 BetaChannel 1
AlphaVersion 0 AlphaVersion 0
AppVersionOriginal 2.4.8.beta AppVersionOriginal 2.4.9.beta

4
changelog.txt
View File

@ -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) 2.4.8 beta (06.11.20)
- Upgrade Qt to version 5.15.1. - Upgrade Qt to version 5.15.1.

4
docs/building-msvc.md
View File

@ -33,7 +33,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd ThirdParty cd ThirdParty
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout a77e4d5 git checkout e052c49
cd ../ cd ../
git clone https://chromium.googlesource.com/external/gyp git clone https://chromium.googlesource.com/external/gyp
cd 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 git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout a77e4d5 git checkout e052c49
cd .. cd ..
git clone https://github.com/desktop-app/lzma.git git clone https://github.com/desktop-app/lzma.git

4
docs/building-xcode.md
View File

@ -29,7 +29,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout cdca495 git checkout e052c49
cd ../ cd ../
git clone https://chromium.googlesource.com/external/gyp git clone https://chromium.googlesource.com/external/gyp
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git 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 git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout cdca495 git checkout e052c49
cd .. cd ..
git clone https://git.tukaani.org/xz.git git clone https://git.tukaani.org/xz.git