From 60cbd96d91296e815753487cdfc9cc764abe36a2 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 28 Jun 2021 13:51:06 +0300 Subject: [PATCH] Version 2.8.3. - Fix crashes in OpenSSL on macOS. --- 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 ++++ docs/building-xcode.md | 4 ++-- 7 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 834a8edb7..c3f5edc2e 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.8.3.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 6e629b2ec..17bcc26f1 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,2,0 - PRODUCTVERSION 2,8,2,0 + FILEVERSION 2,8,3,0 + PRODUCTVERSION 2,8,3,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.2.0" + VALUE "FileVersion", "2.8.3.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.8.2.0" + VALUE "ProductVersion", "2.8.3.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 9fe6a3723..9b36b6811 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,2,0 - PRODUCTVERSION 2,8,2,0 + FILEVERSION 2,8,3,0 + PRODUCTVERSION 2,8,3,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.2.0" + VALUE "FileVersion", "2.8.3.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.8.2.0" + VALUE "ProductVersion", "2.8.3.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 4de830995..16d2831cb 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 = 2008002; -constexpr auto AppVersionStr = "2.8.2"; +constexpr auto AppVersion = 2008003; +constexpr auto AppVersionStr = "2.8.3"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index cc0690485..9dda1a58e 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2008002 +AppVersion 2008003 AppVersionStrMajor 2.8 -AppVersionStrSmall 2.8.2 -AppVersionStr 2.8.2 +AppVersionStrSmall 2.8.3 +AppVersionStr 2.8.3 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.8.2 +AppVersionOriginal 2.8.3 diff --git a/changelog.txt b/changelog.txt index 48821c2b8..f8091bd0f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.8.3 (28.06.21) + +- Fix crashes in OpenSSL on macOS. + 2.8.2 (27.06.21) - Attempt to fix random crashes on macOS. diff --git a/docs/building-xcode.md b/docs/building-xcode.md index c2465f12b..7d416af36 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -92,8 +92,8 @@ Go to ***BuildPath*** and run git clone https://github.com/openssl/openssl openssl_1_1_1 cd openssl_1_1_1 - git checkout OpenSSL_1_1_1k - ./Configure --prefix=/usr/local/macos no-tests darwin64-x86_64-cc -static -g3 $MIN_VER + git checkout OpenSSL_1_1_1-stable + ./Configure --prefix=/usr/local/macos no-shared no-tests darwin64-x86_64-cc $MIN_VER make build_libs $MAKE_THREADS_CNT cd ..