gentoo resync : 17.02.2021

3 files changed, 65 insertions, 2 deletions

diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index dd91d404d193..8e10af487332 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,6 @@
+AUX gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch 2262 BLAKE2B 1607c876c2fa81be04337c6bda4b574d421e9d51661309b544aceec770e55dbb3f74c6393a9ddea31f434f11a02e131c2087430a6e69213d8092bb99f12ed8f3 SHA512 e8817cd1ce672bb0e7be4ab64d24a461c0bb381503e4d0b2048d614d8adf2e1aa0067c5f728f30bd8e785a83a26a832efdb6eff75ba79b3b54a7e3b7bbb48221
 DIST gnome-shell-extension-applications-overview-tooltip-10.tar.gz 81397 BLAKE2B a9c838eb66ae49a3a195d8ce6e17fd971fb0dec00f62a2a7380fc973c9ba129611a93b904c658318e0bc80fb26ff9d65100cccd29f7f172dbef0f406bacefd14 SHA512 28bcc52b38d36e0897c949ba0eef11a94fce2e022ca3d398208221476b63b39281db9870d0c26a4bdffc07bb82e9d8942fd98820c78c6a4afe6d52eb5758e1c1
 DIST gnome-shell-extension-applications-overview-tooltip-9.tar.gz 81415 BLAKE2B 518352e80b5a3c6f8a2ff05e692178436625ea533e10a2afde82e73b6216f82dc29119c0e0a204ac8f1619de9409c47105107b94e3c4d1027c852b255eeb27ab SHA512 b8a2879f303a76e68eb5921005453e3fb73d966f1ed3f5978d9d210f447d8f780b5d9fa359aaa411f7ed8cecf72171dfcaa8da8515fd620193676b1b63742636
-EBUILD gnome-shell-extension-applications-overview-tooltip-10.ebuild 1193 BLAKE2B d40a81efa58bf9f9dfc079ffcd47bb6a7c6bc849c732e1212616c38e4f941387b9518b9da30b25cf1b8f4c852ff71045d0e922f1484889efd4740f4a24bd20c7 SHA512 15b515144936404e225a323828d1d2b2862f0a75c0f5445aa963993b9fcd0871d75b4679f26973fd826818be70b570b2f9b3dd215dc48662025adbe57428ac5c
+EBUILD gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild 1295 BLAKE2B 1648eacaf070c02d7b64c27a7a2399eff9f24906d932ef7db66feae9c1a5eb4549b8324ea0c2832cb2c6cb5e8d3180bfaa9e858367cac2101f28fa5bafda845e SHA512 dd1f7cccd2adccb3274a42c011aff451eb3fb87ed5fa483b65f397c18a786e9275dfd6666e6804cd9b96f2d6ded8f49e6aca28d939fca6d8b9851b3c46d3b6cc
 EBUILD gnome-shell-extension-applications-overview-tooltip-9.ebuild 1257 BLAKE2B 56d3fe14b44a58c5d2eb9b59ffc99ebbe0448227e27a68252950d0f676a765a5983e44c554d1e06249653ef74b0655a1f516f15509baa05b3e9310c0beaab737 SHA512 faa26aa51c48098efca83872ac76ad3215d30ebf8c8493df70e32dc719da37378d21b9b87a47d45c89caf5d3958a7205496bfd08f9d4a060e67c8383ef616130
 MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch
new file mode 100644
index 000000000000..293a710aa2fb
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/files/gnome-shell-extension-applications-overview-tooltip-10-search-tooltip.patch
@@ -0,0 +1,57 @@
+From f90ddba2fbd2256e03b4f22f7ca29004bbdbe466 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Rochet?= <raphael@rri.fr>
+Date: Fri, 29 Jan 2021 11:11:58 +0100
+Subject: [PATCH] Brings back tooltips on search results
+
+---
+ extension.js | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/extension.js b/extension.js
+index 860daf0..1a5b2c0 100644
+--- a/extension.js
++++ b/extension.js
+@@ -24,6 +24,7 @@ let BORDERS			= false;
+ 
+ // private variables
+ let _old_addItem = null;		// used to restore monkey patched function on disable
++let _old_searchAddItem = null;	// same but for search results
+ let _tooltips = null;			// used to disconnect events on disable
+ let _labelTimeoutId = 0;		// id of timer waiting for start
+ let _resetHoverTimeoutId = 0;	// id of last (cancellable) timer
+@@ -57,7 +58,7 @@ function enable() {
+ 	// Enabling tooltips for already loaded icons
+ 	_connectAll(Main.overview.viewSelector.appDisplay);
+ 
+-	// monkeypatching for future icons (includes search results app icons)
++	// monkeypatching for future app icons
+ 	_old_addItem = imports.ui.iconGrid.IconGrid.prototype.addItem;
+ 	imports.ui.iconGrid.IconGrid.prototype.addItem = function(item, index){
+ 		_connect(item);
+@@ -65,6 +66,13 @@ function enable() {
+ 		_old_addItem.apply(this, arguments);
+ 	};
+ 
++	// monkeypatching for future app icons in search results
++	_old_searchAddItem = imports.ui.search.GridSearchResults.prototype._addItem;
++	imports.ui.search.GridSearchResults.prototype._addItem = function(display){
++		_connect(display);
++		_old_searchAddItem.apply(this, arguments);
++	};
++
+ 	// apply new settings if changed
+ 	_settingsConnectionId = _settings.connect('changed', _applySettings);
+ 
+@@ -87,8 +95,11 @@ function disable() {
+ 	if (_settingsConnectionId > 0) _settings.disconnect(_settingsConnectionId);
+ 	_settings = null;
+ 
+-	// restore the original addItem function
++	// restore the original addItem functions and remove references to them
+ 	imports.ui.iconGrid.IconGrid.prototype.addItem = _old_addItem;
++	imports.ui.search.GridSearchResults.prototype._addItem = _old_searchAddItem;
++	_old_addItem = null;
++	_old_searchAddItem = null;
+ 
+ 	// disconnects from all loaded icons
+ 	for (let i = 0; i < _tooltips.length; i++) {
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild
index 2f000f6faee8..752839d2b804 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,11 @@ BDEPEND=""
 
 S="${WORKDIR}/${P/gnome-shell-extension-}"
 
+PATCHES=(
+	# Fix tooltip in search results, from 'master'
+	"${FILESDIR}/${P}-search-tooltip.patch"
+)
+
 src_install() {
 	einstalldocs
 	insinto /usr/share/glib-2.0/schemas