Adding metadata

3 files changed, 40 insertions, 4 deletions

diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index a0f59e660940..255b09d8048e 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,2 +1,2 @@
 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
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 *
 }