diff options
author | Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-03-19 10:45:19 -0700 |
---|---|---|
committer | Georgy Yakovlev <gyakovlev@gentoo.org> | 2020-03-19 10:47:20 -0700 |
commit | a16bcf73d9baa23503a2b714466cbab6cd56547d (patch) | |
tree | ddb90eac6c7419238dcf1b2a385a41afbb90fec8 /net-im/telegram-desktop/files | |
parent | net-im/telegram-desktop: bump to 1.9.21 (diff) | |
download | gentoo-a16bcf73d9baa23503a2b714466cbab6cd56547d.tar.gz gentoo-a16bcf73d9baa23503a2b714466cbab6cd56547d.tar.bz2 gentoo-a16bcf73d9baa23503a2b714466cbab6cd56547d.zip |
net-im/telegram-desktop: drop old
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'net-im/telegram-desktop/files')
-rw-r--r-- | net-im/telegram-desktop/files/1.9.19-crash.patch | 47 | ||||
-rw-r--r-- | net-im/telegram-desktop/files/1.9.20-gcc9.patch | 36 |
2 files changed, 0 insertions, 83 deletions
diff --git a/net-im/telegram-desktop/files/1.9.19-crash.patch b/net-im/telegram-desktop/files/1.9.19-crash.patch deleted file mode 100644 index ff88aec74eb6..000000000000 --- a/net-im/telegram-desktop/files/1.9.19-crash.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 844e9b60ddf01712082e7ff87cfe74bb20d97297 Mon Sep 17 00:00:00 2001 -From: John Preston <johnprestonmail@gmail.com> -Date: Tue, 25 Feb 2020 16:12:04 +0400 -Subject: [PATCH] Fix crash in SearchController. - -Data::Histories cancels request in Main::Session::api(), so the -request must be sent using this global api(), not custom MTP::Sender. ---- - Telegram/SourceFiles/data/data_search_controller.cpp | 5 ++--- - Telegram/SourceFiles/data/data_search_controller.h | 1 - - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/Telegram/SourceFiles/data/data_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp -index 08541b13da..90fbd36762 100644 ---- a/Telegram/SourceFiles/data/data_search_controller.cpp -+++ b/Telegram/SourceFiles/data/data_search_controller.cpp -@@ -194,8 +194,7 @@ SearchController::CacheEntry::CacheEntry(const Query &query) - } - - SearchController::SearchController(not_null<Main::Session*> session) --: _session(session) --, _api(session->api().instance()) { -+: _session(session) { - } - - bool SearchController::hasInCache(const Query &query) const { -@@ -372,7 +371,7 @@ void SearchController::requestMore( - const auto type = ::Data::Histories::RequestType::History; - const auto history = _session->data().history(listData->peer); - auto requestId = histories.sendRequest(history, type, [=](Fn<void()> finish) { -- return _api.request( -+ return _session->api().request( - std::move(*prepared) - ).done([=](const MTPmessages_Messages &result) { - listData->requests.remove(key); -diff --git a/Telegram/SourceFiles/data/data_search_controller.h b/Telegram/SourceFiles/data/data_search_controller.h -index a439bb38ed..f9341ac4d4 100644 ---- a/Telegram/SourceFiles/data/data_search_controller.h -+++ b/Telegram/SourceFiles/data/data_search_controller.h -@@ -130,7 +130,6 @@ class SearchController final { - Data *listData); - - const not_null<Main::Session*> _session; -- MTP::Sender _api; - Cache _cache; - Cache::iterator _current = _cache.end(); - diff --git a/net-im/telegram-desktop/files/1.9.20-gcc9.patch b/net-im/telegram-desktop/files/1.9.20-gcc9.patch deleted file mode 100644 index 4fef1aa2877d..000000000000 --- a/net-im/telegram-desktop/files/1.9.20-gcc9.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cf89b5a94411afa9d3f36e9f27e40426f8899bc1 Mon Sep 17 00:00:00 2001 -From: Ilya Fedin <fedin-ilja2010@ya.ru> -Date: Sat, 14 Mar 2020 23:35:51 +0400 -Subject: [PATCH] Fix build with gcc 9 - ---- - .../SourceFiles/platform/linux/notifications_manager_linux.cpp | 2 +- - Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp -index 6b9057437d..86382ab812 100644 ---- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp -@@ -104,7 +104,7 @@ bool Inhibited() { - const QDBusReply<QVariant> reply = QDBusConnection::sessionBus().call( - message); - -- constexpr auto notSupportedErrors = { -+ const auto notSupportedErrors = { - QDBusError::ServiceUnknown, - QDBusError::InvalidArgs, - }; -diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index b9c5d3f0b8..916a26360f 100644 ---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -374,7 +374,7 @@ std::optional<crl::time> LastUserInputTime() { - const QDBusReply<uint> reply = QDBusConnection::sessionBus().call( - message); - -- constexpr auto notSupportedErrors = { -+ const auto notSupportedErrors = { - QDBusError::ServiceUnknown, - QDBusError::NotSupported, - }; |