Version 4.14.15.

- Fix webview regression on Linux X11. (2nd attempt)
TelegramOrg · Feb 9, 2024 · e5f90cd · e5f90cd
1 parent a10d668
commit e5f90cd
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="4.14.14.0" />
+    Version="4.14.15.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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.
+39 −39		webview/platform/linux/webview_linux_compositor.cpp
+55 −16		webview/platform/linux/webview_linux_webkitgtk.cpp
+11 −0		webview/platform/linux/webview_linux_webkitgtk_library.cpp
+44 −8		webview/platform/linux/webview_linux_webkitgtk_library.h