Skip to content

Commit ea5b189

Browse files
authored
Merge branch 'telegramdesktop:dev' into layer214
2 parents a870fbd + 147439a commit ea5b189

File tree

130 files changed

+1608
-719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+1608
-719
lines changed

.github/workflows/mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
macos:
4242
name: MacOS
43-
runs-on: macos-13
43+
runs-on: macos-15-intel
4444

4545
strategy:
4646
matrix:

.github/workflows/mac_packaged.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
brew update
7171
brew upgrade || true
72-
brew install ada-url autoconf automake boost cmake ffmpeg jpeg-xl libavif libheif libtool openal-soft openh264 openssl opus ninja pkg-config python qt yasm xz
72+
brew install ada-url autoconf automake boost cmake ffmpeg@6 jpeg-xl libavif libheif libtool openal-soft openh264 openssl opus ninja pkg-config python qt yasm xz
7373
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
7474
7575
xcodebuild -version > CACHE_KEY.txt
@@ -82,6 +82,7 @@ jobs:
8282
fi
8383
echo "CACHE_KEY=`md5 -q CACHE_KEY.txt`" >> $GITHUB_ENV
8484
85+
echo "MACOSX_DEPLOYMENT_TARGET=$(grep 'set(QT_SUPPORTED_MIN_MACOS_VERSION' /opt/homebrew/Cellar/qt/6.9.2/lib/cmake/Qt6/Qt6ConfigExtras.cmake | sed -E 's/^.*"(.*)"\)$/\1/')" >> $GITHUB_ENV
8586
echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
8687
8788
curl -o tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
stale:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/stale@v9
10+
- uses: actions/stale@v10
1111
with:
1212
stale-issue-message: |
1313
Hey there!

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Version **1.8.15** was the last that supports older systems
4545
* Qt 6 ([LGPL](http://doc.qt.io/qt-6/lgpl.html)) and Qt 5.15 ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) slightly patched
4646
* OpenSSL 3.2.1 ([Apache License 2.0](https://www.openssl.org/source/apache-license-2.0.txt))
4747
* WebRTC ([New BSD License](https://github.com/desktop-app/tg_owt/blob/master/LICENSE))
48-
* zlib 1.2.11 ([zlib License](http://www.zlib.net/zlib_license.html))
48+
* zlib ([zlib License](http://www.zlib.net/zlib_license.html))
4949
* LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html))
5050
* liblzma ([public domain](http://tukaani.org/xz/))
5151
* Google Breakpad ([License](https://chromium.googlesource.com/breakpad/breakpad/+/master/LICENSE))

Telegram/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ include(cmake/td_mtproto.cmake)
3535
include(cmake/td_scheme.cmake)
3636
include(cmake/td_tde2e.cmake)
3737
include(cmake/td_ui.cmake)
38-
include(cmake/generate_appdata_changelog.cmake)
38+
include(cmake/generate_appstream_changelog.cmake)
3939

4040
if (DESKTOP_APP_TEST_APPS)
4141
include(cmake/tests.cmake)
@@ -1795,6 +1795,8 @@ if (WIN32)
17951795
if (QT_VERSION LESS 6)
17961796
target_link_libraries(Telegram PRIVATE desktop-app::win_directx_helper)
17971797
endif()
1798+
1799+
target_link_options(Telegram PRIVATE /PDBPAGESIZE:8192)
17981800
elseif (APPLE)
17991801
if (NOT DESKTOP_APP_USE_PACKAGED)
18001802
target_link_libraries(Telegram PRIVATE desktop-app::external_iconv)
@@ -2130,7 +2132,7 @@ if (LINUX AND DESKTOP_APP_USE_PACKAGED)
21302132
include(GNUInstallDirs)
21312133
configure_file("../lib/xdg/org.telegram.desktop.service" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.service" @ONLY)
21322134
configure_file("../lib/xdg/org.telegram.desktop.metainfo.xml" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml" @ONLY)
2133-
generate_appdata_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml")
2135+
generate_appstream_changelog(Telegram "${CMAKE_SOURCE_DIR}/changelog.txt" "${CMAKE_CURRENT_BINARY_DIR}/org.telegram.desktop.metainfo.xml")
21342136
install(TARGETS Telegram RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}")
21352137
install(FILES "Resources/art/icon16.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps" RENAME "org.telegram.desktop.png")
21362138
install(FILES "Resources/art/icon32.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps" RENAME "org.telegram.desktop.png")

Telegram/Resources/langs/lang.strings

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3589,6 +3589,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
35893589
"lng_gift_stars_resale" = "resale";
35903590
"lng_gift_stars_on_sale" = "on sale";
35913591
"lng_gift_stars_premium" = "premium";
3592+
"lng_gift_stars_your_left#one" = "{count} left";
3593+
"lng_gift_stars_your_left#other" = "{count} left";
3594+
"lng_gift_stars_your_finished" = "none left";
35923595
"lng_gift_stars_tabs_all" = "All Gifts";
35933596
"lng_gift_stars_tabs_my" = "My Gifts";
35943597
"lng_gift_stars_tabs_limited" = "Limited";
@@ -3662,7 +3665,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
36623665
"lng_gift_self_about" = "Buy yourself a gift to display on your page or reserve for later.\n\nLimited-edition gifts upgraded to collectibles can be gifted to others later.";
36633666
"lng_gift_channel_title" = "Send a Gift";
36643667
"lng_gift_channel_about" = "Select a gift to show appreciation for {name}.";
3665-
"lng_gift_released_by" = "Released by {name}";
3668+
"lng_gift_released_by" = "released by {name}";
36663669
"lng_gift_unique_owner" = "Owner";
36673670
"lng_gift_unique_address_copied" = "Address copied to clipboard.";
36683671
"lng_gift_unique_status" = "Status";
@@ -5009,8 +5012,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
50095012
"lng_payments_webview_no_use" = "Unfortunately, you can't use payments with current system configuration.";
50105013
"lng_payments_webview_install_edge" = "Please install {link}.";
50115014
"lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
5012-
"lng_payments_webview_enable_opengl" = "Please enable OpenGL in application settings.";
5013-
"lng_payments_webview_switch_x11" = "Unsupported display server. Please switch to X11.";
50145015
"lng_payments_webview_update_windows" = "Please update your system to Windows 8.1 or later.";
50155016
"lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost.";
50165017
"lng_payments_receipt_label" = "Receipt";
@@ -6175,6 +6176,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
61756176

61766177
"lng_todo_title" = "Checklist";
61776178
"lng_todo_title_group" = "Group Checklist";
6179+
"lng_todo_title_user" = "Checklist";
61786180
"lng_todo_completed#one" = "{count} of {total} completed";
61796181
"lng_todo_completed#other" = "{count} of {total} completed";
61806182
"lng_todo_completed_none" = "None of {total} completed";

Telegram/Resources/uwp/AppX/AppxManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
1111
ProcessorArchitecture="ARCHITECTURE"
1212
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
13-
Version="6.1.3.0" />
13+
Version="6.1.4.0" />
1414
<Properties>
1515
<DisplayName>Telegram Desktop</DisplayName>
1616
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
4444
//
4545

4646
VS_VERSION_INFO VERSIONINFO
47-
FILEVERSION 6,1,3,0
48-
PRODUCTVERSION 6,1,3,0
47+
FILEVERSION 6,1,4,0
48+
PRODUCTVERSION 6,1,4,0
4949
FILEFLAGSMASK 0x3fL
5050
#ifdef _DEBUG
5151
FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
6262
BEGIN
6363
VALUE "CompanyName", "Telegram FZ-LLC"
6464
VALUE "FileDescription", "Telegram Desktop"
65-
VALUE "FileVersion", "6.1.3.0"
65+
VALUE "FileVersion", "6.1.4.0"
6666
VALUE "LegalCopyright", "Copyright (C) 2014-2025"
6767
VALUE "ProductName", "Telegram Desktop"
68-
VALUE "ProductVersion", "6.1.3.0"
68+
VALUE "ProductVersion", "6.1.4.0"
6969
END
7070
END
7171
BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
3535
//
3636

3737
VS_VERSION_INFO VERSIONINFO
38-
FILEVERSION 6,1,3,0
39-
PRODUCTVERSION 6,1,3,0
38+
FILEVERSION 6,1,4,0
39+
PRODUCTVERSION 6,1,4,0
4040
FILEFLAGSMASK 0x3fL
4141
#ifdef _DEBUG
4242
FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
5353
BEGIN
5454
VALUE "CompanyName", "Telegram FZ-LLC"
5555
VALUE "FileDescription", "Telegram Desktop Updater"
56-
VALUE "FileVersion", "6.1.3.0"
56+
VALUE "FileVersion", "6.1.4.0"
5757
VALUE "LegalCopyright", "Copyright (C) 2014-2025"
5858
VALUE "ProductName", "Telegram Desktop"
59-
VALUE "ProductVersion", "6.1.3.0"
59+
VALUE "ProductVersion", "6.1.4.0"
6060
END
6161
END
6262
BLOCK "VarFileInfo"

Telegram/SourceFiles/api/api_authorizations.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Authorizations::Authorizations(not_null<ApiWrap*> api)
9898
api->session().saveSettingsDelayed();
9999
}) {
100100
_unreviewed = api->session().settings().unreviewed();
101-
removeExpiredUnreviewed();
101+
crl::on_main(&api->session(), [=] { removeExpiredUnreviewed(); });
102102
Core::App().settings().deviceModelChanges(
103103
) | rpl::start_with_next([=](const QString &model) {
104104
auto changed = false;

0 commit comments

Comments
 (0)