From d6ed5765d6ffb8906d1bab85aa64fc2fc6bfc734 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 15 Sep 2024 23:02:55 +1000 Subject: [PATCH] Telegram: bump version --- ....5.2.patchset => libtgvoip-5.5.5.patchset} | 2 +- ....2.patchset => pch_disable-5.5.5.patchset} | 70 +++++++++++-------- ...tchset => telegram_desktop-5.5.5.patchset} | 10 +-- ...2.recipe => telegram_desktop-5.5.5.recipe} | 2 +- 4 files changed, 47 insertions(+), 37 deletions(-) rename net-im/telegram-desktop/patches/{libtgvoip-5.5.2.patchset => libtgvoip-5.5.5.patchset} (99%) rename net-im/telegram-desktop/patches/{pch_disable-5.5.2.patchset => pch_disable-5.5.5.patchset} (99%) rename net-im/telegram-desktop/patches/{telegram_desktop-5.5.2.patchset => telegram_desktop-5.5.5.patchset} (99%) rename net-im/telegram-desktop/{telegram_desktop-5.5.2.recipe => telegram_desktop-5.5.5.recipe} (98%) diff --git a/net-im/telegram-desktop/patches/libtgvoip-5.5.2.patchset b/net-im/telegram-desktop/patches/libtgvoip-5.5.5.patchset similarity index 99% rename from net-im/telegram-desktop/patches/libtgvoip-5.5.2.patchset rename to net-im/telegram-desktop/patches/libtgvoip-5.5.5.patchset index b8274c780..a9e8a0735 100644 --- a/net-im/telegram-desktop/patches/libtgvoip-5.5.2.patchset +++ b/net-im/telegram-desktop/patches/libtgvoip-5.5.5.patchset @@ -1,4 +1,4 @@ -From 988a550f1aab9837196e53a21fe2d27f86879c6f Mon Sep 17 00:00:00 2001 +From 4f0b34d79fc40853e4da280383d1595e132e485e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 1 Aug 2024 22:40:58 +1000 Subject: Add haiku support diff --git a/net-im/telegram-desktop/patches/pch_disable-5.5.2.patchset b/net-im/telegram-desktop/patches/pch_disable-5.5.5.patchset similarity index 99% rename from net-im/telegram-desktop/patches/pch_disable-5.5.2.patchset rename to net-im/telegram-desktop/patches/pch_disable-5.5.5.patchset index 804f6756c..c3927dd1b 100644 --- a/net-im/telegram-desktop/patches/pch_disable-5.5.2.patchset +++ b/net-im/telegram-desktop/patches/pch_disable-5.5.5.patchset @@ -1,15 +1,15 @@ -From 0b9c61af4ae44003a118f4dda1dbd02c359b1e03 Mon Sep 17 00:00:00 2001 +From bcab1f151ab3bbe7911c897ccd50acca4bb40811 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 10 Sep 2024 05:09:01 +0000 +Date: Sun, 15 Sep 2024 11:44:17 +0000 Subject: Add PCH file diff --git a/pch_disable.patchset b/pch_disable.patchset new file mode 100644 -index 0000000..460a85e +index 0000000..ce311bb --- /dev/null +++ b/pch_disable.patchset -@@ -0,0 +1,11064 @@ +@@ -0,0 +1,11074 @@ +diff --git a/Telegram/SourceFiles/api/api_attached_stickers.cpp b/Telegram/SourceFiles/api/api_attached_stickers.cpp +index 0f18e76..f7147e2 100644 +--- a/Telegram/SourceFiles/api/api_attached_stickers.cpp @@ -362,7 +362,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp -+index 25ee380..ec23774 100644 ++index 3bbab8c..47dde0b 100644 +--- a/Telegram/SourceFiles/api/api_updates.cpp ++++ b/Telegram/SourceFiles/api/api_updates.cpp +@@ -1,3 +1,4 @@ @@ -416,7 +416,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp -+index 773558c..bc18b4a 100644 ++index 5ef4af3..ec302ad 100644 +--- a/Telegram/SourceFiles/apiwrap.cpp ++++ b/Telegram/SourceFiles/apiwrap.cpp +@@ -1,3 +1,4 @@ @@ -616,7 +616,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp -+index e86b081..6277adc 100644 ++index aaeda8a..6b60009 100644 +--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp ++++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp +@@ -1,3 +1,6 @@ @@ -857,7 +857,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp -+index 203a027..d2993a8 100644 ++index 8e1a110..fd1f521 100644 +--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp ++++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp +@@ -1,3 +1,6 @@ @@ -868,7 +868,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp -+index 86d8e35..88063ed 100644 ++index e3f3870..5369cf7 100644 +--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp ++++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp +@@ -1,3 +1,6 @@ @@ -1057,7 +1057,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp -+index e6b36b6..e1bbee3 100644 ++index d1757da..7a40bbb 100644 +--- a/Telegram/SourceFiles/boxes/send_files_box.cpp ++++ b/Telegram/SourceFiles/boxes/send_files_box.cpp +@@ -1,3 +1,5 @@ @@ -1543,7 +1543,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp -+index 8c4a86e..c0f56e0 100644 ++index e38c134..06b6e3b 100644 +--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp ++++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp +@@ -1,3 +1,4 @@ @@ -1808,7 +1808,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/core/mime_type.cpp b/Telegram/SourceFiles/core/mime_type.cpp -+index 2748f76..bd67dde 100644 ++index 5e15fd4..a44b60d 100644 +--- a/Telegram/SourceFiles/core/mime_type.cpp ++++ b/Telegram/SourceFiles/core/mime_type.cpp +@@ -1,3 +1,4 @@ @@ -2366,7 +2366,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp -+index 2298ddc..58b2563 100644 ++index 79266a5..289aacd 100644 +--- a/Telegram/SourceFiles/data/data_media_types.cpp ++++ b/Telegram/SourceFiles/data/data_media_types.cpp +@@ -1,3 +1,5 @@ @@ -3458,7 +3458,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/history/history_view_swipe.cpp b/Telegram/SourceFiles/history/history_view_swipe.cpp -+index 041664e..905cdb0 100644 ++index cca7a4d..36f5f15 100644 +--- a/Telegram/SourceFiles/history/history_view_swipe.cpp ++++ b/Telegram/SourceFiles/history/history_view_swipe.cpp +@@ -1,3 +1,4 @@ @@ -3476,7 +3476,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp -+index 5746ab0..0ad2da0 100644 ++index d857f25..5284f31 100644 +--- a/Telegram/SourceFiles/history/history_widget.cpp ++++ b/Telegram/SourceFiles/history/history_widget.cpp +@@ -1,3 +1,5 @@ @@ -3773,7 +3773,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp -+index 3e88f1d..c919d60 100644 ++index 845b70f..2108192 100644 +--- a/Telegram/SourceFiles/history/view/history_view_replies_section.cpp ++++ b/Telegram/SourceFiles/history/view/history_view_replies_section.cpp +@@ -1,3 +1,5 @@ @@ -3983,7 +3983,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp -+index 8e77ef8..eabe5ea 100644 ++index 62bf0f6..0275bd7 100644 +--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp ++++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp +@@ -1,3 +1,5 @@ @@ -4003,7 +4003,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/history/view/media/history_view_game.cpp b/Telegram/SourceFiles/history/view/media/history_view_game.cpp -+index 2eda351..86c52db 100644 ++index d8a92fd..d34f543 100644 +--- a/Telegram/SourceFiles/history/view/media/history_view_game.cpp ++++ b/Telegram/SourceFiles/history/view/media/history_view_game.cpp +@@ -1,3 +1,5 @@ @@ -4033,7 +4033,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp -+index ace7024..8bcb3a3 100644 ++index eba510c..117de5a 100644 +--- a/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp ++++ b/Telegram/SourceFiles/history/view/media/history_view_invoice.cpp +@@ -1,3 +1,5 @@ @@ -4233,7 +4233,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp -+index 0f09922..1b7ffa9 100644 ++index 71fa581..6c900f9 100644 +--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp ++++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp +@@ -1,3 +1,5 @@ @@ -4539,7 +4539,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp -+index c97be9f..47e3e14 100644 ++index 992f9f4..82745e7 100644 +--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp ++++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp +@@ -1,3 +1,5 @@ @@ -4649,7 +4649,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp -+index e79a645..1061910 100644 ++index 9df27a1..3df8f4b 100644 +--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp ++++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +@@ -1,3 +1,5 @@ @@ -4669,7 +4669,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp -+index f7326ea..bea85d5 100644 ++index 3c6fc0e..f14ae5a 100644 +--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp ++++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp +@@ -1,3 +1,5 @@ @@ -4748,7 +4748,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp -+index 3a0f956..ba47e08 100644 ++index 70719e9..c7c4ca9 100644 +--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp ++++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp +@@ -1,3 +1,5 @@ @@ -6284,7 +6284,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp -+index d8c70f1..d0f38de 100644 ++index 4357a17..80d0674 100644 +--- a/Telegram/SourceFiles/overview/overview_layout.cpp ++++ b/Telegram/SourceFiles/overview/overview_layout.cpp +@@ -1,3 +1,4 @@ @@ -6667,7 +6667,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp -+index 9afde3b..f5959d0 100644 ++index 0089103..c252997 100644 +--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp ++++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp +@@ -1,3 +1,4 @@ @@ -6813,7 +6813,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp -+index e984b9b..8144f1e 100644 ++index e0d35ef..3d43e72 100644 +--- a/Telegram/SourceFiles/settings/business/settings_chat_links.cpp ++++ b/Telegram/SourceFiles/settings/business/settings_chat_links.cpp +@@ -1,3 +1,5 @@ @@ -7505,7 +7505,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/storage/storage_media_prepare.cpp b/Telegram/SourceFiles/storage/storage_media_prepare.cpp -+index 9424217..e0e8516 100644 ++index 5e3421b..600971f 100644 +--- a/Telegram/SourceFiles/storage/storage_media_prepare.cpp ++++ b/Telegram/SourceFiles/storage/storage_media_prepare.cpp +@@ -1,3 +1,4 @@ @@ -7739,6 +7739,16 @@ index 0000000..460a85e + /* + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. ++diff --git a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp ++index 7001e51..97cac5d 100644 ++--- a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp +++++ b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp ++@@ -1,3 +1,5 @@ +++#include "ui/ui_pch.h" +++#include "stdafx.h" ++ /* ++ This file is part of Telegram Desktop, ++ the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp b/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp +index d56889f..95c6295 100644 +--- a/Telegram/SourceFiles/ui/boxes/rate_call_box.cpp @@ -8947,7 +8957,7 @@ index 0000000..460a85e + This file is part of Telegram Desktop, + the official desktop application for the Telegram messaging service. +diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp -+index 194d366..d8d777d 100644 ++index 0d22289..404d1bd 100644 +--- a/Telegram/SourceFiles/window/window_main_menu.cpp ++++ b/Telegram/SourceFiles/window/window_main_menu.cpp +@@ -1,3 +1,4 @@ @@ -10535,7 +10545,7 @@ index 0000000..460a85e + // a set of libraries for developing nice desktop applications. + // +diff --git a/Telegram/lib_ui/ui/text/text_entity.cpp b/Telegram/lib_ui/ui/text/text_entity.cpp -+index 16f897d..9649706 100644 ++index 2e0fc10..dc88f35 100644 +--- a/Telegram/lib_ui/ui/text/text_entity.cpp ++++ b/Telegram/lib_ui/ui/text/text_entity.cpp +@@ -1,3 +1,4 @@ diff --git a/net-im/telegram-desktop/patches/telegram_desktop-5.5.2.patchset b/net-im/telegram-desktop/patches/telegram_desktop-5.5.5.patchset similarity index 99% rename from net-im/telegram-desktop/patches/telegram_desktop-5.5.2.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-5.5.5.patchset index 31ee5d749..90cd348b9 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-5.5.2.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-5.5.5.patchset @@ -1,4 +1,4 @@ -From b264d506761442e46e2278a2d011c0eece67cadf Mon Sep 17 00:00:00 2001 +From f7b32da6ae799705c42ee11662ac7a488d8e9c24 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 1 Aug 2024 22:42:14 +1000 Subject: Add haiku support @@ -138,7 +138,7 @@ index 0000000..e5f8b64 + +resource("BEOS:default_shortcut") "S"; diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index a9e8498..19584bd 100644 +index 83aadae..082cca2 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -97,6 +97,15 @@ PRIVATE @@ -157,7 +157,7 @@ index a9e8498..19584bd 100644 target_precompile_headers(Telegram PRIVATE $<$:${src_loc}/stdafx.h>) nice_target_sources(Telegram ${src_loc} PRIVATE -@@ -1618,6 +1627,16 @@ if (NOT build_winstore) +@@ -1620,6 +1629,16 @@ if (NOT build_winstore) ) endif() @@ -174,7 +174,7 @@ index a9e8498..19584bd 100644 if (DESKTOP_APP_USE_PACKAGED) remove_target_sources(Telegram ${src_loc} platform/mac/mac_iconv_helper.c -@@ -1781,7 +1800,7 @@ else() +@@ -1783,7 +1802,7 @@ else() set(bundle_identifier "com.tdesktop.Telegram") endif() set(bundle_entitlements "Telegram.entitlements") @@ -1137,7 +1137,7 @@ index ea4b8bf..2ba72a6 100644 2.45.2 -From a654bafddc156ee07156feb1c7f97d0cb5671577 Mon Sep 17 00:00:00 2001 +From 73d33c885a0d8cc698b6c378a7950399e478975f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 2 Aug 2024 23:06:18 +1000 Subject: Use singleheader ada library diff --git a/net-im/telegram-desktop/telegram_desktop-5.5.2.recipe b/net-im/telegram-desktop/telegram_desktop-5.5.5.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-5.5.2.recipe rename to net-im/telegram-desktop/telegram_desktop-5.5.5.recipe index bf8e63bf5..f4746e834 100644 --- a/net-im/telegram-desktop/telegram_desktop-5.5.2.recipe +++ b/net-im/telegram-desktop/telegram_desktop-5.5.5.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2013-2024 Telegram" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" -CHECKSUM_SHA256="4f5aa0f3abc0d82bb92b427f7b9faa41b9ceed937d66ff35a14e331404eeea10" +CHECKSUM_SHA256="dc620831d16af9ee970325e32d689ff3272a7d2aa1966a3e2a1b87513c6f23eb" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" SOURCE_URI_2="https://github.com/ada-url/ada/releases/download/v2.9.0/singleheader.zip"