gentoo resync : 16.04.2022

3 files changed, 42 insertions, 5 deletions

diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index ac3082730bd4..ca36bb31f48d 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,5 +1,6 @@
+AUX gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch 1164 BLAKE2B e25d1101d5bc70f61404de17762bbb17638b9c9f9ad5d921498fd7292df3858c5aff7c44c8b281aedc87c9d2bdae36908aa2f78a949e91a11e0d8a39d0417309 SHA512 16a5794abf382ed9a5c63b35b100d654a1790a5bf4aecd33f65b6b21475cf881444bd8ea6d18e2b86dd68d8373fc42932d5544095df876e8c77f3c490a4f3c2b
 DIST gnome-shell-extension-alphabetical-grid-19.0.tar.gz 288661 BLAKE2B b3df5594422f7d5ba249ec5a3eebf178e845fc2f36f838f61c86c0aa1918f9ca7e942a6af358e3f1744ce7f25a507f3e97bac71848cf6c0bac6339139ffd0d3d SHA512 139f1d06ebeef3b76ac84f71190cf77ebc77571ff3b489bb86f578cfa01ce7de47e53798fece93cb6c45bd82cb6b2a425ba255c1485d5b8739da28bd9959fce8
-DIST gnome-shell-extension-alphabetical-grid-20.0.tar.gz 288708 BLAKE2B 7a03ccc523f950d7df5ac3b2a75894094963db63df72813f3dae0780e4b49eb51958d8069128df76a38a49fc624114bd7ef901db214d0b612278e33d636151e3 SHA512 681ce3be3700db94ba9095c573b3c322d2c7d1ab875bec1f67a821872121318df8c4568281345cf9985c0ed87656e08fc59a48e3a253e63696304d29f5c8a4b6
+DIST gnome-shell-extension-alphabetical-grid-22.0.tar.gz 208959 BLAKE2B 08ab108c0e51249531950ecdec18cdf9b205c0727aeb3e359fd8fb0a1ca9c0d4afec7c3a54b4ee130bc9b63ad58d6619e2d15d17622ccf68172aed38fcc5b97f SHA512 ae8cc174d5c003debe7e78ff415fbde66b495d93ea7130b2aef459ce42b6e7970c4c14221ec7f5febb3f6d2ff05365b738c92e7bc2357867495185e05a82ffea
 EBUILD gnome-shell-extension-alphabetical-grid-19.0.ebuild 1422 BLAKE2B 71bca6a4078f41a08c2a2b3291acad0440c60262b9a6b5c05ffea13485dfa3958aa665395f72b996568fdff222f68d28b36ee715949e9fb2a24434393250d271 SHA512 00ebf81e517bcafb935f061cb11162d3dd99dc13398a9d44eec08f951f22e42402b7f72ae0885d99d72524cf101fffb53db3959756520b2c1bdf43f3f728608e
-EBUILD gnome-shell-extension-alphabetical-grid-20.0.ebuild 1424 BLAKE2B 10dffeb0d196fb8953138099e44668b24c794b8e798d047e017e2de188dfbab451af316eb393e3cfdf46c5e1309276e14eda25ea227233007ebc90e35e7e1ce0 SHA512 290c18e414855f137448aa72d41bfec80d83b07881a86ab822ae7ce4bc93f3a97665b2ca73b14ae04ab44518d7f12be47136b83f0930615689bb5e853fbe5a45
+EBUILD gnome-shell-extension-alphabetical-grid-22.0.ebuild 1434 BLAKE2B 1deaa43cfe9d041f62783e1f9daebd0293061aac412469539f8feffa80221c113728ed84971db83607a0f17652179704ffc7551241d682dc6f5c6febf8eb8dfc SHA512 bdc37596751fbce2d96cac831291bb7f0d80485eef816971ef44fd6dfdd6a5d09437cde3a1e6e30d442afca932a97898ab7759d34ed6061f7ee66da226510e1f
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch b/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
new file mode 100644
index 000000000000..7010a11735ef
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
@@ -0,0 +1,31 @@
+From ae8d9c55ede615c244729e1dd0bd20de3f09e386 Mon Sep 17 00:00:00 2001
+From: stuarthayhurst <stuart.a.hayhurst@gmail.com>
+Date: Fri, 8 Apr 2022 16:06:10 +0100
+Subject: [PATCH] Call original _redisplay() once to setup, respect internal
+ pages updating lock
+
+---
+ extension/extension.js | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/extension/extension.js b/extension/extension.js
+index 2c8cc71..7f6b4db 100644
+--- a/extension/extension.js
++++ b/extension/extension.js
+@@ -23,6 +23,7 @@ function enable() {
+   ExtensionHelper.loggingEnabled = Me.metadata.debug || gridReorder.extensionSettings.get_boolean('logging-enabled');
+ 
+   //Patch shell, reorder and trigger listeners
++  AppDisplay._redisplay();
+   gridReorder.patchShell();
+   gridReorder.startListeners();
+   gridReorder.reorderGrid('Reordering app grid');
+@@ -93,7 +94,7 @@ class Extension {
+ 
+   reorderGrid(logMessage) {
+     //Detect lock to avoid multiple changes at once
+-    if (!this._currentlyUpdating) {
++    if (!this._currentlyUpdating && !AppDisplay._pageManager._updatingPages) {
+       this._currentlyUpdating = true;
+       ExtensionHelper.logMessage(logMessage);
+ 
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-20.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
index 2164b03efc89..75bba270503a 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-20.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/r
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
@@ -29,15 +29,20 @@ extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
 # Tests are only useful for upstream
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/${P}-redisplay.patch"
+)
+
 # Not useful for us
 src_compile() { :; }
 
 src_install() {
 	einstalldocs
+	mv docs/icon.svg extension || die
+	cd extension || die
 	insinto /usr/share/glib-2.0/schemas
 	doins schemas/*.xml
-	rm -rf README.md LICENSE.txt Makefile schemas || die
-	mv -v ui/* . || die # Searches for these files in parent dir
+	rm -rf schemas || die
 	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
 	doins -r *
 }