gentoo Easter resync : 12.04.2020

3 files changed, 99 insertions, 72 deletions

diff --git a/net-im/telegram-desktop/files/0002-PPC-big-endian.patch b/net-im/telegram-desktop/files/0002-PPC-big-endian.patch
deleted file mode 100644
index b1af3deb5878..000000000000
--- a/net-im/telegram-desktop/files/0002-PPC-big-endian.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d4c11502175e2a7821dbd92e029a90d54498e3e8 Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Thu, 2 Jan 2020 12:57:33 +0100
-Subject: [PATCH] PPC big endian
-
----
- Telegram/SourceFiles/config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h
-index fb7b54e4d..6a873fbd7 100644
---- a/Telegram/SourceFiles/config.h
-+++ b/Telegram/SourceFiles/config.h
-@@ -177,7 +177,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb";
- #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH
- 
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
--#error "Only little endian is supported!"
-+#warning "Only little endian is supported!"
- #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN
- 
- #if (TDESKTOP_ALPHA_VERSION != 0)
--- 
-2.24.1
-
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.21-icon.patch b/net-im/telegram-desktop/files/1.9.21-icon.patch
new file mode 100644
index 000000000000..689e01af72cb
--- /dev/null
+++ b/net-im/telegram-desktop/files/1.9.21-icon.patch
@@ -0,0 +1,99 @@
+From d2291f5b17e0c169083a34e51053a99546207ec8 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Tue, 17 Mar 2020 23:13:11 +0400
+Subject: [PATCH] Fix panel icon forcing
+
+---
+ .../platform/linux/main_window_linux.cpp      | 20 +++++++++++--------
+ .../platform/linux/main_window_linux.h        |  2 +-
+ 2 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+index 347395ab38..3d30ef755c 100644
+--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
++++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+@@ -78,7 +78,8 @@ QString GetTrayIconName(int counter, bool muted) {
+ 	const auto iconName = GetIconName();
+ 	const auto panelIconName = GetPanelIconName(counter, muted);
+ 
+-	if (QIcon::hasThemeIcon(panelIconName)) {
++	if (QIcon::hasThemeIcon(panelIconName)
++		|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8())) {
+ 		return panelIconName;
+ 	} else if (QIcon::hasThemeIcon(iconName)) {
+ 		return iconName;
+@@ -158,7 +159,7 @@ QIcon TrayIconGen(int counter, bool muted) {
+ 			|| iconThemeName != TrayIconThemeName
+ 			|| iconName != TrayIconName) {
+ 			if (!iconName.isEmpty()) {
+-				if(systemIcon.isNull()) {
++				if (systemIcon.isNull()) {
+ 					systemIcon = QIcon::fromTheme(iconName);
+ 				}
+ 
+@@ -467,11 +468,12 @@ void MainWindow::psTrayMenuUpdated() {
+ }
+ 
+ #ifndef TDESKTOP_DISABLE_DBUS_INTEGRATION
+-void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) {
++void MainWindow::setSNITrayIcon(int counter, bool muted) {
+ 	const auto iconName = GetTrayIconName(counter, muted);
+ 
+ 	if (qEnvironmentVariableIsSet(kDisableTrayCounter.utf8())
+-		&& ((!iconName.isEmpty() && !InSnap())
++		&& !iconName.isEmpty()
++		&& (!InSnap()
+ 			|| qEnvironmentVariableIsSet(kForcePanelIcon.utf8()))) {
+ 		if (_sniTrayIcon->iconName() == iconName) {
+ 			return;
+@@ -480,7 +482,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) {
+ 		_sniTrayIcon->setIconByName(iconName);
+ 		_sniTrayIcon->setToolTipIconByName(iconName);
+ 	} else if (IsIndicatorApplication()) {
+-		if(!IsIconRegenerationNeeded(counter, muted) && !firstShow) {
++		if (!IsIconRegenerationNeeded(counter, muted)
++			&& !_sniTrayIcon->iconName().isEmpty()) {
+ 			return;
+ 		}
+ 
+@@ -492,7 +495,8 @@ void MainWindow::setSNITrayIcon(int counter, bool muted, bool firstShow) {
+ 			_sniTrayIcon->setIconByName(_trayIconFile->fileName());
+ 		}
+ 	} else {
+-		if(!IsIconRegenerationNeeded(counter, muted) && !firstShow) {
++		if (!IsIconRegenerationNeeded(counter, muted)
++			&& !_sniTrayIcon->iconPixmap().isEmpty()) {
+ 			return;
+ 		}
+ 
+@@ -554,7 +558,7 @@ void MainWindow::onSNIOwnerChanged(
+ 
+ 	cSetSupportTray(trayAvailable);
+ 
+-	if(cSupportTray()) {
++	if (cSupportTray()) {
+ 		psSetupTrayIcon();
+ 	} else {
+ 		LOG(("System tray is not available."));
+@@ -575,7 +579,7 @@ void MainWindow::psSetupTrayIcon() {
+ 				this);
+ 
+ 			_sniTrayIcon->setTitle(AppName.utf16());
+-			setSNITrayIcon(counter, muted, true);
++			setSNITrayIcon(counter, muted);
+ 
+ 			attachToSNITrayIcon();
+ 		}
+diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
+index 8602c53806..43ab722845 100644
+--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
++++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
+@@ -123,7 +123,7 @@ public slots:
+ 	QAction *psMonospace = nullptr;
+ 	QAction *psClearFormat = nullptr;
+ 
+-	void setSNITrayIcon(int counter, bool muted, bool firstShow = false);
++	void setSNITrayIcon(int counter, bool muted);
+ 	void attachToSNITrayIcon();
+ #endif // !TDESKTOP_DISABLE_DBUS_INTEGRATION
+