Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f55d3d1c6a | ||
|
|
deea69e119 | ||
|
|
6925bf6a8e | ||
|
|
a0110fed27 | ||
|
|
30a945a043 | ||
|
|
c062b4b3a1 | ||
|
|
06fb5540e1 |
@@ -10,7 +10,7 @@
|
||||
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
|
||||
ProcessorArchitecture="ARCHITECTURE"
|
||||
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
|
||||
Version="3.2.4.0" />
|
||||
Version="3.2.5.0" />
|
||||
<Properties>
|
||||
<DisplayName>Telegram Desktop</DisplayName>
|
||||
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
|
||||
|
||||
@@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,2,4,0
|
||||
PRODUCTVERSION 3,2,4,0
|
||||
FILEVERSION 3,2,5,0
|
||||
PRODUCTVERSION 3,2,5,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -62,10 +62,10 @@ BEGIN
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Telegram FZ-LLC"
|
||||
VALUE "FileDescription", "Telegram Desktop"
|
||||
VALUE "FileVersion", "3.2.4.0"
|
||||
VALUE "FileVersion", "3.2.5.0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2014-2021"
|
||||
VALUE "ProductName", "Telegram Desktop"
|
||||
VALUE "ProductVersion", "3.2.4.0"
|
||||
VALUE "ProductVersion", "3.2.5.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 3,2,4,0
|
||||
PRODUCTVERSION 3,2,4,0
|
||||
FILEVERSION 3,2,5,0
|
||||
PRODUCTVERSION 3,2,5,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", "3.2.4.0"
|
||||
VALUE "FileVersion", "3.2.5.0"
|
||||
VALUE "LegalCopyright", "Copyright (C) 2014-2021"
|
||||
VALUE "ProductName", "Telegram Desktop"
|
||||
VALUE "ProductVersion", "3.2.4.0"
|
||||
VALUE "ProductVersion", "3.2.5.0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
|
||||
@@ -291,10 +291,6 @@ bool WhoReadExists(not_null<HistoryItem*> item) {
|
||||
const auto megagroup = peer->asMegagroup();
|
||||
if (!chat && !megagroup) {
|
||||
return false;
|
||||
} else if (peer->migrateTo()) {
|
||||
// They're all always marked as read.
|
||||
// We don't know if there really are any readers.
|
||||
return false;
|
||||
}
|
||||
const auto &appConfig = peer->session().account().appConfig();
|
||||
const auto expirePeriod = TimeId(appConfig.get<double>(
|
||||
|
||||
@@ -208,7 +208,6 @@ void Application::run() {
|
||||
style::internal::StartFonts();
|
||||
|
||||
ThirdParty::start();
|
||||
refreshGlobalProxy(); // Depends on Core::IsAppLaunched().
|
||||
|
||||
// Depends on OpenSSL on macOS, so on ThirdParty::start().
|
||||
// Depends on notifications settings.
|
||||
@@ -217,6 +216,8 @@ void Application::run() {
|
||||
startLocalStorage();
|
||||
ValidateScale();
|
||||
|
||||
refreshGlobalProxy(); // Depends on app settings being read.
|
||||
|
||||
if (Local::oldSettingsVersion() < AppVersion) {
|
||||
RegisterUrlScheme();
|
||||
psNewVersion();
|
||||
|
||||
@@ -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 = 3002004;
|
||||
constexpr auto AppVersionStr = "3.2.4";
|
||||
constexpr auto AppVersion = 3002005;
|
||||
constexpr auto AppVersionStr = "3.2.5";
|
||||
constexpr auto AppBetaVersion = false;
|
||||
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
|
||||
|
||||
@@ -20,9 +20,9 @@ ENV CMAKE_VER 3.21.3
|
||||
ENV CMAKE_FILE cmake-$CMAKE_VER-Linux-x86_64.sh
|
||||
ENV PATH ${PATH}:${QT5_PREFIX}/bin:${QT6_PREFIX}/bin
|
||||
|
||||
RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
|
||||
RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
|
||||
RUN yum -y install centos-release-scl
|
||||
RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum clean all
|
||||
RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm && yum clean all
|
||||
RUN yum -y install centos-release-scl && yum clean all
|
||||
|
||||
RUN yum -y install git meson ninja-build autoconf automake libtool \
|
||||
fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
|
||||
@@ -30,7 +30,7 @@ RUN yum -y install git meson ninja-build autoconf automake libtool \
|
||||
webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \
|
||||
devtoolset-9-make devtoolset-9-gcc devtoolset-9-gcc-c++ \
|
||||
devtoolset-9-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \
|
||||
llvm-toolset-7.0-llvm-devel
|
||||
llvm-toolset-7.0-llvm-devel perl-XML-Parser && yum clean all
|
||||
|
||||
SHELL [ "bash", "-c", ". /opt/rh/devtoolset-9/enable; exec bash -c \"$@\"", "-s"]
|
||||
|
||||
@@ -652,7 +652,6 @@ RUN rm -rf libsigcplusplus
|
||||
FROM patches AS glibmm
|
||||
COPY --from=mm-common ${LibrariesPath}/mm-common-cache /
|
||||
COPY --from=libsigcplusplus ${LibrariesPath}/libsigcplusplus-cache /
|
||||
RUN yum -y install perl-XML-Parser
|
||||
|
||||
# equals to glib version of Ubuntu 14.04
|
||||
RUN git clone -b 2.40.0 --depth=1 $GIT/GNOME/glibmm.git
|
||||
|
||||
@@ -401,7 +401,7 @@ if customRunCommand:
|
||||
stage('patches', """
|
||||
git clone https://github.com/desktop-app/patches.git
|
||||
cd patches
|
||||
git checkout 17c7e63cfd
|
||||
git checkout 85bce38ec7
|
||||
""")
|
||||
|
||||
stage('depot_tools', """
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
AppVersion 3002004
|
||||
AppVersion 3002005
|
||||
AppVersionStrMajor 3.2
|
||||
AppVersionStrSmall 3.2.4
|
||||
AppVersionStr 3.2.4
|
||||
AppVersionStrSmall 3.2.5
|
||||
AppVersionStr 3.2.5
|
||||
BetaChannel 0
|
||||
AlphaVersion 0
|
||||
AppVersionOriginal 3.2.4
|
||||
AppVersionOriginal 3.2.5
|
||||
|
||||
Submodule Telegram/lib_base updated: 3294b5a9bf...29ecc271c0
@@ -1,3 +1,8 @@
|
||||
3.2.5 (16.11.21) [Windows, macOS]
|
||||
|
||||
- Fix connecting in case bad characters appear in device name on Windows.
|
||||
- Fix custom input methods on macOS.
|
||||
|
||||
3.2.4 (13.11.21)
|
||||
|
||||
- Fix editing of scheduled messages on macOS.
|
||||
|
||||
Reference in New Issue
Block a user