From e5f90cd40d552674d7943f8f422c340203909658 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 10 Feb 2024 00:32:40 +0400 Subject: [PATCH] Version 4.14.15. - Fix webview regression on Linux X11. (2nd attempt) --- 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 ++++---- Telegram/lib_webview | 2 +- changelog.txt | 4 ++++ 7 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index f201ce5b8d4b1..276d6be2fdd20 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="4.14.15.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index ef7ff18bd02e9..452e4e8c0f231 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 4,14,14,0 - PRODUCTVERSION 4,14,14,0 + FILEVERSION 4,14,15,0 + PRODUCTVERSION 4,14,15,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "4.14.14.0" + VALUE "FileVersion", "4.14.15.0" VALUE "LegalCopyright", "Copyright (C) 2014-2024" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.14.14.0" + VALUE "ProductVersion", "4.14.15.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 2dcf9cd4f7337..d4dfd203f3821 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 4,14,14,0 - PRODUCTVERSION 4,14,14,0 + FILEVERSION 4,14,15,0 + PRODUCTVERSION 4,14,15,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", "4.14.14.0" + VALUE "FileVersion", "4.14.15.0" VALUE "LegalCopyright", "Copyright (C) 2014-2024" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "4.14.14.0" + VALUE "ProductVersion", "4.14.15.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index a7c371978b2b2..dfd280a0931f3 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 = 4014014; -constexpr auto AppVersionStr = "4.14.14"; +constexpr auto AppVersion = 4014015; +constexpr auto AppVersionStr = "4.14.15"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 4110ac17ca3a4..17d7d81b892cc 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 4014014 +AppVersion 4014015 AppVersionStrMajor 4.14 -AppVersionStrSmall 4.14.14 -AppVersionStr 4.14.14 +AppVersionStrSmall 4.14.15 +AppVersionStr 4.14.15 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 4.14.14 +AppVersionOriginal 4.14.15 diff --git a/Telegram/lib_webview b/Telegram/lib_webview index 75cc4c04d28a0..db36c99359b0c 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit 75cc4c04d28a09172b1df596913c09161aaede35 +Subproject commit db36c99359b0c1cb376c8fa6f5f7ab80807eb45f diff --git a/changelog.txt b/changelog.txt index 98d342585bd79..e2ecb5f9807e7 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +4.14.15 (10.02.24) + +- Fix webview regression on Linux X11. (2nd attempt) + 4.14.14 (09.02.24) - Fix webview regression on Linux X11.