Skip to content

Commit

Permalink
Updated to 3.7.6.
Browse files Browse the repository at this point in the history
Removed FORKGRAM_LIMIT_ACCOUNTS.
  • Loading branch information
23rd committed Jun 17, 2022
2 parents 527421a + 45caa25 commit c99dae7
Show file tree
Hide file tree
Showing 560 changed files with 15,911 additions and 5,204 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ jobs:
- name: Upload.
if: (github.event_name == 'release')
uses: svenstaro/upload-release-action@v1-release
uses: svenstaro/upload-release-action@2.3.0
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: ./Telegram.tar.xz
Expand Down
Empty file added .github/workflows/snap.yml
Empty file.
4 changes: 2 additions & 2 deletions .github/workflows/win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@ jobs:
if [ -n "${{ matrix.defines }}" ]; then
DEFINE="-D ${{ matrix.defines }}=ON"
echo Define from matrix: $DEFINE
echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
echo "ARTIFACT_NAME=Telegram_${{ matrix.arch }}_${{ matrix.defines }}" >> $GITHUB_ENV
else
echo "ARTIFACT_NAME=Telegram" >> $GITHUB_ENV
echo "ARTIFACT_NAME=Telegram_${{ matrix.arch }}" >> $GITHUB_ENV
fi
echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV
Expand Down
6 changes: 0 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,9 @@
[submodule "Telegram/ThirdParty/jemalloc"]
path = Telegram/ThirdParty/jemalloc
url = https://github.com/jemalloc/jemalloc
[submodule "Telegram/ThirdParty/kwayland"]
path = Telegram/ThirdParty/kwayland
url = https://github.com/KDE/kwayland.git
[submodule "Telegram/ThirdParty/dispatch"]
path = Telegram/ThirdParty/dispatch
url = https://github.com/apple/swift-corelibs-libdispatch
[submodule "Telegram/ThirdParty/extra-cmake-modules"]
path = Telegram/ThirdParty/extra-cmake-modules
url = https://github.com/KDE/extra-cmake-modules.git
[submodule "Telegram/ThirdParty/plasma-wayland-protocols"]
path = Telegram/ThirdParty/plasma-wayland-protocols
url = https://github.com/KDE/plasma-wayland-protocols.git
Expand Down
7 changes: 6 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
# For license and copyright information please follow this link:
# https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

cmake_minimum_required(VERSION 3.16)
if (APPLE)
# target_precompile_headers with COMPILE_LANGUAGE restriction.
cmake_minimum_required(VERSION 3.23)
else()
cmake_minimum_required(VERSION 3.16)
endif()
cmake_policy(SET CMP0076 NEW)
cmake_policy(SET CMP0091 NEW)

Expand Down
49 changes: 37 additions & 12 deletions Telegram/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ PRIVATE
desktop-app::external_xxhash
)

target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
${style_files}
Expand Down Expand Up @@ -141,6 +141,8 @@ PRIVATE
api/api_peer_photo.h
api/api_polls.cpp
api/api_polls.h
api/api_premium.cpp
api/api_premium.h
api/api_report.cpp
api/api_report.h
api/api_ringtones.cpp
Expand All @@ -159,6 +161,8 @@ PRIVATE
api/api_text_entities.h
api/api_toggling_media.cpp
api/api_toggling_media.h
api/api_transcribes.cpp
api/api_transcribes.h
api/api_unread_things.cpp
api/api_unread_things.h
api/api_updates.cpp
Expand Down Expand Up @@ -260,6 +264,10 @@ PRIVATE
boxes/phone_banned_box.h
boxes/pin_messages_box.cpp
boxes/pin_messages_box.h
boxes/premium_limits_box.cpp
boxes/premium_limits_box.h
boxes/premium_preview_box.cpp
boxes/premium_preview_box.h
boxes/reactions_settings_box.cpp
boxes/reactions_settings_box.h
boxes/report_messages_box.cpp
Expand Down Expand Up @@ -475,13 +483,17 @@ PRIVATE
data/data_media_rotation.h
data/data_media_types.cpp
data/data_media_types.h
data/data_messages.cpp
data/data_messages.h
# data/data_messages.cpp
# data/data_messages.h
data/data_message_reactions.cpp
data/data_message_reactions.h
data/data_msg_id.h
data/data_peer.cpp
data/data_peer.h
data/data_peer_bot_command.cpp
data/data_peer_bot_command.h
data/data_peer_bot_commands.cpp
data/data_peer_bot_commands.h
data/data_peer_id.cpp
data/data_peer_id.h
data/data_peer_values.cpp
Expand All @@ -492,6 +504,8 @@ PRIVATE
data/data_photo_media.h
data/data_poll.cpp
data/data_poll.h
data/data_premium_limits.cpp
data/data_premium_limits.h
data/data_pts_waiter.cpp
data/data_pts_waiter.h
data/data_replies_list.cpp
Expand Down Expand Up @@ -548,6 +562,8 @@ PRIVATE
dialogs/ui/dialogs_layout.h
dialogs/ui/dialogs_message_view.cpp
dialogs/ui/dialogs_message_view.h
dialogs/ui/dialogs_video_userpic.cpp
dialogs/ui/dialogs_video_userpic.h
editor/color_picker.cpp
editor/color_picker.h
editor/controllers/controllers.h
Expand Down Expand Up @@ -692,6 +708,10 @@ PRIVATE
history/view/history_view_service_message.h
history/view/history_view_spoiler_click_handler.cpp
history/view/history_view_spoiler_click_handler.h
history/view/history_view_sticker_toast.cpp
history/view/history_view_sticker_toast.h
history/view/history_view_transcribe_button.cpp
history/view/history_view_transcribe_button.h
history/view/history_view_top_bar_widget.cpp
history/view/history_view_top_bar_widget.h
history/view/history_view_view_button.cpp
Expand Down Expand Up @@ -722,6 +742,8 @@ PRIVATE
history/history_service.h
history/history_unread_things.cpp
history/history_unread_things.h
history/history_view_highlight_manager.cpp
history/history_view_highlight_manager.h
history/history_widget.cpp
history/history_widget.h
info/info_content_widget.cpp
Expand Down Expand Up @@ -981,8 +1003,6 @@ PRIVATE
platform/linux/linux_wayland_integration_dummy.cpp
platform/linux/linux_wayland_integration.cpp
platform/linux/linux_wayland_integration.h
platform/linux/linux_xdp_file_dialog.cpp
platform/linux/linux_xdp_file_dialog.h
platform/linux/linux_xdp_open_with_dialog.cpp
platform/linux/linux_xdp_open_with_dialog.h
platform/linux/file_utilities_linux.cpp
Expand Down Expand Up @@ -1122,6 +1142,8 @@ PRIVATE
settings/settings_main.h
settings/settings_notifications.cpp
settings/settings_notifications.h
settings/settings_premium.cpp
settings/settings_premium.h
settings/settings_privacy_controllers.cpp
settings/settings_privacy_controllers.h
settings/settings_privacy_security.cpp
Expand Down Expand Up @@ -1189,13 +1211,9 @@ PRIVATE
ui/chat/choose_send_as.h
ui/chat/choose_theme_controller.cpp
ui/chat/choose_theme_controller.h
ui/effects/fireworks_animation.cpp
ui/effects/fireworks_animation.h
ui/effects/message_sending_animation_common.h
ui/effects/message_sending_animation_controller.cpp
ui/effects/message_sending_animation_controller.h
ui/effects/round_checkbox.cpp
ui/effects/round_checkbox.h
ui/effects/send_action_animations.cpp
ui/effects/send_action_animations.h
ui/image/image.cpp
Expand Down Expand Up @@ -1306,8 +1324,6 @@ endif()

if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
remove_target_sources(Telegram ${src_loc}
platform/linux/linux_xdp_file_dialog.cpp
platform/linux/linux_xdp_file_dialog.h
platform/linux/linux_xdp_open_with_dialog.cpp
platform/linux/linux_xdp_open_with_dialog.h
platform/linux/notifications_manager_linux.cpp
Expand Down Expand Up @@ -1436,10 +1452,19 @@ else()
endif()

if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
if (DESKTOP_APP_QT6)
qt6_generate_wayland_protocol_client_sources(Telegram
FILES
${third_party_loc}/plasma-wayland-protocols/src/protocols/plasma-shell.xml
)
else()
message(FATAL_ERROR "This piece of cmake code is not ported to Qt 5")
endif()

target_link_libraries(Telegram
PRIVATE
desktop-app::lib_waylandshells
desktop-app::external_kwayland
desktop-app::external_wayland_client
)
endif()
endif()
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Telegram/Resources/icons/chat/voice_to_text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Telegram/Resources/icons/chat/voice_to_text@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Telegram/Resources/icons/dialogs/dialogs_premium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/dialogs/dialogs_verified_check.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/dialogs/dialogs_verified_check@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/dialogs/dialogs_verified_check@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/dialogs/dialogs_verified_star.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/dialogs/dialogs_verified_star@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/dialogs/dialogs_verified_star@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/emoji/emoji_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/emoji/emoji_settings@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Telegram/Resources/icons/emoji/emoji_settings@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Telegram/Resources/icons/emoji/premium_lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Telegram/Resources/icons/emoji/stickers_premium.png
Binary file modified Telegram/Resources/icons/emoji/stickers_search.png
Binary file modified Telegram/Resources/icons/emoji/stickers_search@2x.png
Binary file modified Telegram/Resources/icons/emoji/stickers_search@3x.png
Binary file added Telegram/Resources/icons/limits/accounts.png
Binary file added Telegram/Resources/icons/limits/accounts@2x.png
Binary file added Telegram/Resources/icons/limits/accounts@3x.png
Binary file added Telegram/Resources/icons/limits/chats.png
Binary file added Telegram/Resources/icons/limits/chats@2x.png
Binary file added Telegram/Resources/icons/limits/chats@3x.png
Binary file added Telegram/Resources/icons/limits/files.png
Binary file added Telegram/Resources/icons/limits/files@2x.png
Binary file added Telegram/Resources/icons/limits/files@3x.png
Binary file added Telegram/Resources/icons/limits/folders.png
Binary file added Telegram/Resources/icons/limits/folders@2x.png
Binary file added Telegram/Resources/icons/limits/folders@3x.png
Binary file added Telegram/Resources/icons/limits/groups.png
Binary file added Telegram/Resources/icons/limits/groups@2x.png
Binary file added Telegram/Resources/icons/limits/groups@3x.png
Binary file added Telegram/Resources/icons/limits/links.png
Binary file added Telegram/Resources/icons/limits/links@2x.png
Binary file added Telegram/Resources/icons/limits/links@3x.png
Binary file added Telegram/Resources/icons/limits/pins.png
Binary file added Telegram/Resources/icons/limits/pins@2x.png
Binary file added Telegram/Resources/icons/limits/pins@3x.png
Binary file removed Telegram/Resources/icons/profile_admin_star.png
Diff not rendered.
Binary file removed Telegram/Resources/icons/profile_admin_star@2x.png
Diff not rendered.
Binary file removed Telegram/Resources/icons/profile_admin_star@3x.png
Diff not rendered.
Binary file added Telegram/Resources/icons/profile_premium.png
Binary file added Telegram/Resources/icons/profile_premium@2x.png
Binary file added Telegram/Resources/icons/profile_premium@3x.png
Binary file modified Telegram/Resources/icons/profile_verified_check.png
Binary file modified Telegram/Resources/icons/profile_verified_check@2x.png
Binary file modified Telegram/Resources/icons/profile_verified_check@3x.png
Binary file modified Telegram/Resources/icons/profile_verified_star.png
Binary file modified Telegram/Resources/icons/profile_verified_star@2x.png
Binary file modified Telegram/Resources/icons/profile_verified_star@3x.png
Binary file added Telegram/Resources/icons/settings/premium/double.png
Binary file added Telegram/Resources/icons/settings/premium/files.png
Binary file added Telegram/Resources/icons/settings/premium/like.png
Binary file added Telegram/Resources/icons/settings/premium/play.png
Binary file added Telegram/Resources/icons/settings/premium/speed.png
Binary file added Telegram/Resources/icons/settings/premium/star.png
Binary file added Telegram/Resources/icons/settings/premium/voice.png
9 changes: 9 additions & 0 deletions Telegram/Resources/icons/settings/star.svg
7 changes: 7 additions & 0 deletions Telegram/Resources/icons/settings/starmini.svg
Loading

0 comments on commit c99dae7

Please sign in to comment.