diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 4716432a8aa92e..45ec14889b7462 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -10,7 +10,7 @@ + Version="5.2.6.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 91720d2351927f..83eecf0a79f858 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 5,2,5,0 - PRODUCTVERSION 5,2,5,0 + FILEVERSION 5,2,6,0 + PRODUCTVERSION 5,2,6,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "5.2.5.0" + VALUE "FileVersion", "5.2.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2024" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "5.2.5.0" + VALUE "ProductVersion", "5.2.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 829055b26bc787..40bb30f11b78bb 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 5,2,5,0 - PRODUCTVERSION 5,2,5,0 + FILEVERSION 5,2,6,0 + PRODUCTVERSION 5,2,6,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", "5.2.5.0" + VALUE "FileVersion", "5.2.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2024" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "5.2.5.0" + VALUE "ProductVersion", "5.2.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index fcfe70dd86436a..111881fd487991 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 = 5002005; -constexpr auto AppVersionStr = "5.2.5"; +constexpr auto AppVersion = 5002006; +constexpr auto AppVersionStr = "5.2.6"; 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 99816a198bde2a..568d6663afce9f 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -771,7 +771,7 @@ COPY --link --from=pipewire {{ LibrariesPath }}/pipewire-cache / RUN git init tg_owt \ && cd tg_owt \ && git remote add origin {{ GIT }}/desktop-app/tg_owt.git \ - && git fetch --depth=1 origin c0ba7b391c0fd1d408fc0d58f4fbecb68a6fcd55 \ + && git fetch --depth=1 origin 4a60ce1ab9fdb962004c6a959f682ace3db50cbd \ && git reset --hard FETCH_HEAD \ && git submodule update --init --recursive --depth=1 \ && rm -rf .git \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index b7c447019f7b61..83e16284fd656f 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -1718,7 +1718,7 @@ def runStages(): stage('tg_owt', """ git clone https://github.com/desktop-app/tg_owt.git cd tg_owt - git checkout c0ba7b391c + git checkout 4a60ce1ab9 git submodule init git submodule update win: diff --git a/Telegram/build/version b/Telegram/build/version index 3e6807e8b5eef2..f10750e38d861c 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 5002005 +AppVersion 5002006 AppVersionStrMajor 5.2 -AppVersionStrSmall 5.2.5 -AppVersionStr 5.2.5 +AppVersionStrSmall 5.2.6 +AppVersionStr 5.2.6 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 5.2.5.beta +AppVersionOriginal 5.2.6.beta diff --git a/changelog.txt b/changelog.txt index 09adb583503625..5ec213f7e928ba 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +5.2.6 beta (29.07.24) + +- Fix launching on X11. (Linux) + 5.2.5 beta (27.07.24) - Fix media viewer context menu. diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 12fa23acb08aa6..b5f71d99f28e0e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -433,7 +433,7 @@ parts: webrtc: source: https://github.com/desktop-app/tg_owt.git source-depth: 1 - source-commit: c0ba7b391c0fd1d408fc0d58f4fbecb68a6fcd55 + source-commit: 4a60ce1ab9fdb962004c6a959f682ace3db50cbd plugin: cmake build-environment: - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s