[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/

[Georgy Yakovlev]

commit:     1992207efa411206083b772b1d0e818ccea141ae
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 02:43:15 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 02:44:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1992207e

net-im/telegram-desktop: bump to 1.9.19, drop 1.9.18

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-im/telegram-desktop/Manifest                   |  2 +-
 .../files/1.9.18-hunspell-cmake.patch              | 22 ----------
 net-im/telegram-desktop/files/1.9.19-crash.patch   | 47 ++++++++++++++++++++++
 ....9.18.ebuild => telegram-desktop-1.9.19.ebuild} |  2 +-
 4 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 50a9bdaa45f..00fca507490 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,4 +1,4 @@
 DIST tdesktop-1.9.14-full.tar.gz 25324084 BLAKE2B 45c071aa573541b6e483d2ae712b7f3b672c1294e8e7e624d9292f7176482f4d68069c35541019dc27fdb1c66134c29fb4d3667f1197e7085e4f8a80c8ca603c SHA512 56efa64048d23b280782b51319c0071c6cef833cb7e2584e52c6e45488577755beb85185ec9187029c425cc8d4c9c1887142687c744697e7731a15abe2846056
 DIST tdesktop-1.9.15-full.tar.gz 25327647 BLAKE2B 5d689f656a66d55b3e62d52d48106270fc16675a01ff8a2b865c122191c7ee4781c2e698d0652c765a10985148ade0ce5dd47f4938538f24348cd5b42fe0160c SHA512 457b568226e34cc23e379d34a9ad21d0d6c26fb69647cd17bf74aef48ad9ce35eae6697795af8c349f43e376b44bcab49e1939733b1cc20ec16ddf1c29a32c4e
 DIST tdesktop-1.9.16-full.tar.gz 25328085 BLAKE2B 1d429964e67641a1cfa0f826820ed54eb7e37d9946fdd3292d5d67276609d736dcfb2b4c422f6b64364705eb68e78f6ac6bfa52096ca39d948a9e01bc152404b SHA512 89cdf12456d9bcaa4e332286d2d5c4da6cf715bd0e798e51e458adb7bf5c89044899beb9ac7b11a808b81e37958473a473e3774519420baf7a6bc34eb7938733
-DIST tdesktop-1.9.18-full.tar.gz 25840600 BLAKE2B c9138f547dde25549ec93b845de4036feee296c4bf8148a623da16177a901c017e4b2bd8a4ebd8e9e5c077a0cb8c7cf5058160c2d5230ccfe74dd7272b5254d5 SHA512 8cf293055f1929dea4b5cbea1b56d0be997e08ba820d3492c674cfaa79396719de139fe9cee313dc91d8e5eb05a56f0ba55c0c2e7912c5ca291c018a6f403ba8
+DIST tdesktop-1.9.19-full.tar.gz 25840478 BLAKE2B 1a730e74df71af0c8fcc579fb1b2546fe279d64dd60786a32e015dbc0046a5d4a933bfdc128f7bb2b624705e6788ec6d597ceeb328f91dc173d1c5a0e739a29c SHA512 29070c6e1d813943d5062dc1703f383a18323b5698fbc4e6f2c89b33366da9da5d1ec84dc29950288e7e7d112024de2924244ec9c800d59d4b210e6288c7291d

diff --git a/net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch b/net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch
deleted file mode 100644
index bbf250861ad..00000000000
--- a/net-im/telegram-desktop/files/1.9.18-hunspell-cmake.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 81e27ccc0e7bf27405569ce98582860dfc9ea9bb Mon Sep 17 00:00:00 2001
-From: John Preston <johnprestonmail@×××××.com>
-Date: Tue, 25 Feb 2020 01:11:10 +0400
-Subject: [PATCH] Fix packaged build.
-
----
- external/hunspell/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/external/hunspell/CMakeLists.txt b/cmake/external/hunspell/CMakeLists.txt
-index 6fec471..fbe2e95 100644
---- a/cmake/external/hunspell/CMakeLists.txt
-+++ b/cmake/external/hunspell/CMakeLists.txt
-@@ -5,7 +5,7 @@
- # https://github.com/desktop-app/legal/blob/master/LEGAL
- 
- if (DESKTOP_APP_USE_PACKAGED)
--    add_library(external_hunspell INTERFACE IMPORTED)
-+    add_library(external_hunspell INTERFACE IMPORTED GLOBAL)
-     add_library(desktop-app::external_hunspell ALIAS external_hunspell)
- 
-     find_package(PkgConfig REQUIRED)

diff --git a/net-im/telegram-desktop/files/1.9.19-crash.patch b/net-im/telegram-desktop/files/1.9.19-crash.patch
new file mode 100644
index 00000000000..ff88aec74eb
--- /dev/null
+++ b/net-im/telegram-desktop/files/1.9.19-crash.patch
@@ -0,0 +1,47 @@
+From 844e9b60ddf01712082e7ff87cfe74bb20d97297 Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail@×××××.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/telegram-desktop-1.9.18.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.19.ebuild
similarity index 98%
rename from net-im/telegram-desktop/telegram-desktop-1.9.18.ebuild
rename to net-im/telegram-desktop/telegram-desktop-1.9.19.ebuild
index fd191f347c8..a038d5820ec 100644
--- a/net-im/telegram-desktop/telegram-desktop-1.9.18.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.19.ebuild
@@ -76,7 +76,7 @@ REQUIRED_USE="|| ( alsa pulseaudio )
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PV}-hunspell-cmake.patch" )
+PATCHES=( "${FILESDIR}/${PV}-crash.patch" )
 
 src_configure() {
 	local mycxxflags=(