Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extension-alphabetical-grid/files/, ...
Date: Fri, 27 May 2022 20:54:13
Message-Id: 1653683384.a34ee1abf21c15b6001c60c13ee9dee98bd27ce4.pacho@gentoo
1 commit: a34ee1abf21c15b6001c60c13ee9dee98bd27ce4
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 27 20:29:44 2022 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Fri May 27 20:29:44 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34ee1ab
7
8 gnome-extra/gnome-shell-extension-alphabetical-grid: drop 19.0, 22.0
9
10 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
11
12 .../Manifest | 2 -
13 ...xtension-alphabetical-grid-22.0-redisplay.patch | 31 -----------
14 ...e-shell-extension-alphabetical-grid-19.0.ebuild | 58 --------------------
15 ...e-shell-extension-alphabetical-grid-22.0.ebuild | 63 ----------------------
16 4 files changed, 154 deletions(-)
17
18 diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
19 index a6883da2ca6e..b639a7876bba 100644
20 --- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
21 +++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST gnome-shell-extension-alphabetical-grid-19.0.tar.gz 288661 BLAKE2B b3df5594422f7d5ba249ec5a3eebf178e845fc2f36f838f61c86c0aa1918f9ca7e942a6af358e3f1744ce7f25a507f3e97bac71848cf6c0bac6339139ffd0d3d SHA512 139f1d06ebeef3b76ac84f71190cf77ebc77571ff3b489bb86f578cfa01ce7de47e53798fece93cb6c45bd82cb6b2a425ba255c1485d5b8739da28bd9959fce8
24 -DIST gnome-shell-extension-alphabetical-grid-22.0.tar.gz 208959 BLAKE2B 08ab108c0e51249531950ecdec18cdf9b205c0727aeb3e359fd8fb0a1ca9c0d4afec7c3a54b4ee130bc9b63ad58d6619e2d15d17622ccf68172aed38fcc5b97f SHA512 ae8cc174d5c003debe7e78ff415fbde66b495d93ea7130b2aef459ce42b6e7970c4c14221ec7f5febb3f6d2ff05365b738c92e7bc2357867495185e05a82ffea
25 DIST gnome-shell-extension-alphabetical-grid-23.0.tar.gz 209076 BLAKE2B 82fd5fdd4d10cb134bd47221d0ecdf651f86e7c77872373a27489aec526df715eedd3d7e4407fc4c53617d14984d2690ff0fe6db5ba3c92dabf13d175f0d7a21 SHA512 6c932216956f421838c608fc8e6426039761e6233305dfb1ea0a0bf6c8afc65632983fed12d3f5a3605ff1ef73f8ebc11715ff47ac7570960ff2361e436760f8
26 DIST gnome-shell-extension-alphabetical-grid-24.0.tar.gz 210398 BLAKE2B 6b782085328ca9d61f9aa7406db1f586d35abe50b20e8c2fd06e534166985b1be688b930d4b4f19cd460a69fc4fd5004cf49600fde9a435c7c592d101191f2f6 SHA512 b54ac0b00b4c538ab4064c6bcc197fa65c730e732a80c23e23ed78915e53a8211634f68b842b2f00935b3d48669a19e66ac0eb1d43bcd34955967108a570ebaa
27
28 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
29 deleted file mode 100644
30 index 7010a11735ef..000000000000
31 --- a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
32 +++ /dev/null
33 @@ -1,31 +0,0 @@
34 -From ae8d9c55ede615c244729e1dd0bd20de3f09e386 Mon Sep 17 00:00:00 2001
35 -From: stuarthayhurst <stuart.a.hayhurst@×××××.com>
36 -Date: Fri, 8 Apr 2022 16:06:10 +0100
37 -Subject: [PATCH] Call original _redisplay() once to setup, respect internal
38 - pages updating lock
39 -
40 ----
41 - extension/extension.js | 3 ++-
42 - 1 file changed, 2 insertions(+), 1 deletion(-)
43 -
44 -diff --git a/extension/extension.js b/extension/extension.js
45 -index 2c8cc71..7f6b4db 100644
46 ---- a/extension/extension.js
47 -+++ b/extension/extension.js
48 -@@ -23,6 +23,7 @@ function enable() {
49 - ExtensionHelper.loggingEnabled = Me.metadata.debug || gridReorder.extensionSettings.get_boolean('logging-enabled');
50 -
51 - //Patch shell, reorder and trigger listeners
52 -+ AppDisplay._redisplay();
53 - gridReorder.patchShell();
54 - gridReorder.startListeners();
55 - gridReorder.reorderGrid('Reordering app grid');
56 -@@ -93,7 +94,7 @@ class Extension {
57 -
58 - reorderGrid(logMessage) {
59 - //Detect lock to avoid multiple changes at once
60 -- if (!this._currentlyUpdating) {
61 -+ if (!this._currentlyUpdating && !AppDisplay._pageManager._updatingPages) {
62 - this._currentlyUpdating = true;
63 - ExtensionHelper.logMessage(logMessage);
64 -
65
66 diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
67 deleted file mode 100644
68 index 6a8af9a70239..000000000000
69 --- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
70 +++ /dev/null
71 @@ -1,58 +0,0 @@
72 -# Copyright 1999-2022 Gentoo Authors
73 -# Distributed under the terms of the GNU General Public License v2
74 -
75 -EAPI=8
76 -inherit gnome2-utils
77 -
78 -# Useful specially to prevent
79 -# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
80 -# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
81 -DESCRIPTION="Restore the alphabetical ordering of the app grid"
82 -HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
83 -SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
84 -
85 -LICENSE="GPL-3"
86 -SLOT="0"
87 -KEYWORDS="amd64 x86"
88 -IUSE=""
89 -
90 -RDEPEND="
91 - app-eselect/eselect-gnome-shell-extensions
92 - >=gnome-base/gnome-shell-3.38
93 -"
94 -DEPEND="${COMMON_DEPEND}"
95 -BDEPEND=""
96 -
97 -S="${WORKDIR}/alphabetical-grid-extension-${PV}"
98 -extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
99 -
100 -# Tests are only useful for upstream
101 -RESTRICT="test"
102 -
103 -# Not useful for us
104 -src_compile() { :; }
105 -
106 -src_install() {
107 - einstalldocs
108 - insinto /usr/share/glib-2.0/schemas
109 - doins schemas/*.xml
110 - rm -rf README.md LICENSE.txt Makefile schemas || die
111 - mv -v ui/* . || die # Searches for these files in parent dir
112 - insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
113 - doins -r *
114 -}
115 -
116 -pkg_preinst() {
117 - gnome2_schemas_savelist
118 -}
119 -
120 -pkg_postinst() {
121 - gnome2_schemas_update
122 - ebegin "Updating list of installed extensions"
123 - eselect gnome-shell-extensions update
124 - eend $?
125 -}
126 -
127 -pkg_postrm() {
128 - gnome2_schemas_update
129 -}
130
131 diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
132 deleted file mode 100644
133 index 75bba270503a..000000000000
134 --- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
135 +++ /dev/null
136 @@ -1,63 +0,0 @@
137 -# Copyright 1999-2022 Gentoo Authors
138 -# Distributed under the terms of the GNU General Public License v2
139 -
140 -EAPI=8
141 -inherit gnome2-utils
142 -
143 -# Useful specially to prevent
144 -# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
145 -# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
146 -DESCRIPTION="Restore the alphabetical ordering of the app grid"
147 -HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
148 -SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
149 -
150 -LICENSE="GPL-3"
151 -SLOT="0"
152 -KEYWORDS="amd64 x86"
153 -IUSE=""
154 -
155 -RDEPEND="
156 - app-eselect/eselect-gnome-shell-extensions
157 - >=gnome-base/gnome-shell-3.38
158 -"
159 -DEPEND="${COMMON_DEPEND}"
160 -BDEPEND=""
161 -
162 -S="${WORKDIR}/alphabetical-grid-extension-${PV}"
163 -extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
164 -
165 -# Tests are only useful for upstream
166 -RESTRICT="test"
167 -
168 -PATCHES=(
169 - "${FILESDIR}/${P}-redisplay.patch"
170 -)
171 -
172 -# Not useful for us
173 -src_compile() { :; }
174 -
175 -src_install() {
176 - einstalldocs
177 - mv docs/icon.svg extension || die
178 - cd extension || die
179 - insinto /usr/share/glib-2.0/schemas
180 - doins schemas/*.xml
181 - rm -rf schemas || die
182 - insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
183 - doins -r *
184 -}
185 -
186 -pkg_preinst() {
187 - gnome2_schemas_savelist
188 -}
189 -
190 -pkg_postinst() {
191 - gnome2_schemas_update
192 - ebegin "Updating list of installed extensions"
193 - eselect gnome-shell-extensions update
194 - eend $?
195 -}
196 -
197 -pkg_postrm() {
198 - gnome2_schemas_update
199 -}