Skip to content

Commit b1d6f8d

Browse files
committed
Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into bigEmoj
# Conflicts: # Telegram/SourceFiles/boxes/about_box.cpp # Telegram/SourceFiles/boxes/about_box.h # Telegram/SourceFiles/core/version.h # Telegram/lib_ui
2 parents 3672486 + d205e3b commit b1d6f8d

File tree

260 files changed

+12059
-2244
lines changed

Some content is hidden

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

260 files changed

+12059
-2244
lines changed

.github/workflows/docker.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Docker.
2+
3+
on:
4+
push:
5+
paths:
6+
- '.github/workflows/docker.yml'
7+
- 'Telegram/build/docker/centos_env/**'
8+
9+
jobs:
10+
docker:
11+
name: Ubuntu
12+
runs-on: ubuntu-latest
13+
if: github.ref_name == github.event.repository.default_branch
14+
15+
env:
16+
IMAGE_TAG: ghcr.io/${{ github.repository }}/centos_env:latest
17+
18+
steps:
19+
- name: Clone.
20+
uses: actions/checkout@v4
21+
with:
22+
submodules: recursive
23+
24+
- name: First set up.
25+
run: |
26+
sudo apt update
27+
curl -sSL https://install.python-poetry.org | python3 -
28+
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
29+
30+
- name: Free up some disk space.
31+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
32+
with:
33+
tool-cache: true
34+
35+
- name: Docker image build.
36+
run: |
37+
cd Telegram/build/docker/centos_env
38+
poetry install
39+
DEBUG= LTO= poetry run gen_dockerfile | DOCKER_BUILDKIT=1 docker build -t $IMAGE_TAG -
40+
41+
- name: Push the Docker image.
42+
run: docker push $IMAGE_TAG

Telegram/CMakeLists.txt

Lines changed: 94 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON)
5353

5454
target_link_libraries(Telegram
5555
PRIVATE
56-
# tdesktop::lib_tgcalls_legacy
5756
tdesktop::lib_tgcalls
58-
# tdesktop::lib_tgvoip
5957

6058
# Order in this list defines the order of include paths in command line.
6159
# We need to place desktop-app::external_minizip this early to have its
@@ -127,6 +125,8 @@ PRIVATE
127125
api/api_confirm_phone.h
128126
api/api_credits.cpp
129127
api/api_credits.h
128+
api/api_credits_history_entry.cpp
129+
api/api_credits_history_entry.h
130130
api/api_earn.cpp
131131
api/api_earn.h
132132
api/api_editing.cpp
@@ -176,8 +176,12 @@ PRIVATE
176176
api/api_statistics_data_deserialize.h
177177
api/api_statistics_sender.cpp
178178
api/api_statistics_sender.h
179+
api/api_suggest_post.cpp
180+
api/api_suggest_post.h
179181
api/api_text_entities.cpp
180182
api/api_text_entities.h
183+
api/api_todo_lists.cpp
184+
api/api_todo_lists.h
181185
api/api_toggling_media.cpp
182186
api/api_toggling_media.h
183187
api/api_transcribes.cpp
@@ -281,6 +285,8 @@ PRIVATE
281285
boxes/edit_caption_box.h
282286
boxes/edit_privacy_box.cpp
283287
boxes/edit_privacy_box.h
288+
boxes/edit_todo_list_box.cpp
289+
boxes/edit_todo_list_box.h
284290
boxes/gift_credits_box.cpp
285291
boxes/gift_credits_box.h
286292
boxes/gift_premium_box.cpp
@@ -464,6 +470,7 @@ PRIVATE
464470
core/crash_report_window.h
465471
core/crash_reports.cpp
466472
core/crash_reports.h
473+
core/credits_amount.h
467474
core/deadlock_detector.h
468475
core/file_utilities.cpp
469476
core/file_utilities.h
@@ -477,7 +484,6 @@ PRIVATE
477484
core/sandbox.h
478485
core/shortcuts.cpp
479486
core/shortcuts.h
480-
core/stars_amount.h
481487
core/ui_integration.cpp
482488
core/ui_integration.h
483489
core/update_checker.cpp
@@ -505,6 +511,8 @@ PRIVATE
505511
data/components/promo_suggestions.h
506512
data/components/recent_peers.cpp
507513
data/components/recent_peers.h
514+
data/components/recent_shared_media_gifts.cpp
515+
data/components/recent_shared_media_gifts.h
508516
data/components/scheduled_messages.cpp
509517
data/components/scheduled_messages.h
510518
data/components/sponsored_messages.cpp
@@ -649,6 +657,8 @@ PRIVATE
649657
data/data_streaming.h
650658
data/data_thread.cpp
651659
data/data_thread.h
660+
data/data_todo_list.cpp
661+
data/data_todo_list.h
652662
data/data_types.cpp
653663
data/data_types.h
654664
data/data_unread_value.cpp
@@ -749,6 +759,8 @@ PRIVATE
749759
history/view/controls/history_view_draft_options.h
750760
history/view/controls/history_view_forward_panel.cpp
751761
history/view/controls/history_view_forward_panel.h
762+
history/view/controls/history_view_suggest_options.cpp
763+
history/view/controls/history_view_suggest_options.h
752764
history/view/controls/history_view_ttl_button.cpp
753765
history/view/controls/history_view_ttl_button.h
754766
history/view/controls/history_view_voice_record_bar.cpp
@@ -810,8 +822,12 @@ PRIVATE
810822
history/view/media/history_view_sticker_player_abstract.h
811823
history/view/media/history_view_story_mention.cpp
812824
history/view/media/history_view_story_mention.h
825+
history/view/media/history_view_suggest_decision.cpp
826+
history/view/media/history_view_suggest_decision.h
813827
history/view/media/history_view_theme_document.cpp
814828
history/view/media/history_view_theme_document.h
829+
history/view/media/history_view_todo_list.cpp
830+
history/view/media/history_view_todo_list.h
815831
history/view/media/history_view_unique_gift.cpp
816832
history/view/media/history_view_unique_gift.h
817833
history/view/media/history_view_userpic_suggestion.cpp
@@ -1927,8 +1943,67 @@ if (MSVC)
19271943
)
19281944
target_link_options(Telegram
19291945
PRIVATE
1946+
/DELAYLOAD:secur32.dll
1947+
/DELAYLOAD:winmm.dll
1948+
/DELAYLOAD:ws2_32.dll
1949+
/DELAYLOAD:user32.dll
1950+
/DELAYLOAD:gdi32.dll
19301951
/DELAYLOAD:advapi32.dll
1952+
/DELAYLOAD:avrt.dll
1953+
/DELAYLOAD:shell32.dll
1954+
/DELAYLOAD:ole32.dll
1955+
/DELAYLOAD:oleaut32.dll
1956+
/DELAYLOAD:shlwapi.dll
1957+
/DELAYLOAD:iphlpapi.dll
1958+
/DELAYLOAD:gdiplus.dll
1959+
/DELAYLOAD:version.dll
1960+
/DELAYLOAD:dwmapi.dll
1961+
/DELAYLOAD:uxtheme.dll
1962+
/DELAYLOAD:crypt32.dll
1963+
/DELAYLOAD:bcrypt.dll
1964+
/DELAYLOAD:netapi32.dll
1965+
/DELAYLOAD:imm32.dll
1966+
/DELAYLOAD:userenv.dll
1967+
/DELAYLOAD:wtsapi32.dll
1968+
/DELAYLOAD:propsys.dll
19311969
)
1970+
if (QT_VERSION GREATER 6)
1971+
if (NOT build_winarm)
1972+
target_link_options(Telegram PRIVATE
1973+
/DELAYLOAD:API-MS-Win-EventLog-Legacy-l1-1-0.dll
1974+
)
1975+
endif()
1976+
1977+
target_link_options(Telegram
1978+
PRIVATE
1979+
/DELAYLOAD:API-MS-Win-Core-Console-l1-1-0.dll
1980+
/DELAYLOAD:API-MS-Win-Core-Fibers-l2-1-0.dll
1981+
/DELAYLOAD:API-MS-Win-Core-Fibers-l2-1-1.dll
1982+
/DELAYLOAD:API-MS-Win-Core-File-l1-1-0.dll
1983+
/DELAYLOAD:API-MS-Win-Core-LibraryLoader-l1-2-0.dll
1984+
/DELAYLOAD:API-MS-Win-Core-Localization-l1-2-0.dll
1985+
/DELAYLOAD:API-MS-Win-Core-Memory-l1-1-0.dll
1986+
/DELAYLOAD:API-MS-Win-Core-Memory-l1-1-1.dll
1987+
/DELAYLOAD:API-MS-Win-Core-ProcessThreads-l1-1-0.dll
1988+
/DELAYLOAD:API-MS-Win-Core-Synch-l1-2-0.dll # Synchronization.lib
1989+
/DELAYLOAD:API-MS-Win-Core-SysInfo-l1-1-0.dll
1990+
/DELAYLOAD:API-MS-Win-Core-Timezone-l1-1-0.dll
1991+
/DELAYLOAD:API-MS-Win-Core-WinRT-l1-1-0.dll
1992+
/DELAYLOAD:API-MS-Win-Core-WinRT-Error-l1-1-0.dll
1993+
/DELAYLOAD:API-MS-Win-Core-WinRT-String-l1-1-0.dll
1994+
/DELAYLOAD:API-MS-Win-Security-CryptoAPI-l1-1-0.dll
1995+
# /DELAYLOAD:API-MS-Win-Shcore-Scaling-l1-1-1.dll # We shadowed GetDpiForMonitor
1996+
/DELAYLOAD:authz.dll # Authz.lib
1997+
/DELAYLOAD:comdlg32.dll
1998+
/DELAYLOAD:dwrite.dll # DWrite.lib
1999+
/DELAYLOAD:dxgi.dll # DXGI.lib
2000+
/DELAYLOAD:d3d9.dll # D3D9.lib
2001+
/DELAYLOAD:d3d11.dll # D3D11.lib
2002+
/DELAYLOAD:d3d12.dll # D3D12.lib
2003+
/DELAYLOAD:setupapi.dll # SetupAPI.lib
2004+
/DELAYLOAD:winhttp.dll
2005+
)
2006+
endif()
19322007
endif()
19332008

19342009
target_prepare_qrc(Telegram)
@@ -1959,6 +2034,22 @@ if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_wins
19592034
base/platform/win/base_windows_safe_library.h
19602035
)
19612036
target_include_directories(Updater PRIVATE ${lib_base_loc})
2037+
if (MSVC)
2038+
target_link_libraries(Updater
2039+
PRIVATE
2040+
delayimp
2041+
)
2042+
target_link_options(Updater
2043+
PRIVATE
2044+
/DELAYLOAD:user32.dll
2045+
/DELAYLOAD:advapi32.dll
2046+
/DELAYLOAD:shell32.dll
2047+
/DELAYLOAD:ole32.dll
2048+
/DELAYLOAD:shlwapi.dll
2049+
)
2050+
else()
2051+
target_link_options(Updater PRIVATE -municode)
2052+
endif()
19622053
elseif (APPLE)
19632054
add_custom_command(TARGET Updater
19642055
PRE_LINK
46.8 KB
Binary file not shown.
Lines changed: 8 additions & 0 deletions
Loading
Lines changed: 7 additions & 0 deletions
Loading
Lines changed: 7 additions & 0 deletions
Loading
Lines changed: 7 additions & 0 deletions
Loading
889 Bytes
Loading
1.71 KB
Loading
2.52 KB
Loading

0 commit comments

Comments
 (0)