RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-24 01:06:59 +00:00
Code Issues Projects Releases Wiki Activity

Beta version 5.2.6.

Browse Source 
- Fix launching on X11. (Linux)
This commit is contained in:
John Preston 2024-07-29 08:05:28 +02:00
parent a141d01a23
commit b0981ea8e3
9 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="5.2.5.0" />
Version="5.2.6.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

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

@ -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"

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

@ -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"

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 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;

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

@ -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 \

2
Telegram/build/prepare/prepare.py
View File

@ -1718,7 +1718,7 @@ win:
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:

8
Telegram/build/version
View File

@ -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

4
changelog.txt
View File

@ -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.

2
snap/snapcraft.yaml
View File

@ -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