* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions-topicons-plus/files/, ...
@ 2019-04-14 11:51 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2019-04-14 11:51 UTC (permalink / raw
To: gentoo-commits
commit: ed8b6022a90b09f91868114c1a862c3ba614080f
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 11:50:58 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 11:51:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed8b6022
gnome-extra/gnome-shell-extensions-topicons-plus: Fix stacktrace when removing icon from tray
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
...tensions-topicons-plus-22-exit-stacktrace.patch | 62 ++++++++++++++++++++++
...ome-shell-extensions-topicons-plus-22-r1.ebuild | 49 +++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch b/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch
new file mode 100644
index 00000000000..17082b4ac4f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch
@@ -0,0 +1,62 @@
+From e883e62a36c342bdf2e31af9d328b10f4ce61112 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Tue, 19 Mar 2019 09:39:36 +0100
+Subject: [PATCH] Fix shell stack trace when removing icon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes stacktraces like this when an application with a tray icon exits:
+
+Mar 19 09:09:53 apollon.suse.de gnome-shell[6868]: Object Shell.TrayIcon (0x5588a424ef80), has been already deallocated — impossible to access it. This might be caused by the object having been destroyed from C code using something such as destroy(), dispose(), or remove() vfuncs.
+Mar 19 09:09:53 apollon.suse.de gnome-shell[6868]: clutter_actor_destroy: assertion 'CLUTTER_IS_ACTOR (self)' failed
+Mar 19 09:09:53 apollon.suse.de org.gnome.Shell.desktop[6868]: == Stack trace for context 0x5588a17911b0 ==
+Mar 19 09:09:53 apollon.suse.de org.gnome.Shell.desktop[6868]: #0 5588a2b96d60 i /home/mwilck/.local/share/gnome-shell/extensions/TopIcons@phocean.net/extension.js:127 (7feca5a061f0 @ 92)
+---
+ extension.js | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/extension.js b/extension.js
+index 113b8ef..58a0433 100644
+--- a/extension.js
++++ b/extension.js
+@@ -31,6 +31,7 @@ const PanelMenu = imports.ui.panelMenu;
+ const ExtensionUtils = imports.misc.extensionUtils;
+ const Me = ExtensionUtils.getCurrentExtension();
+ const Convenience = Me.imports.convenience;
++const Config = imports.misc.config;
+
+ let settings = null;
+ let tray = null;
+@@ -118,7 +119,8 @@ function onTrayIconRemoved(o, icon) {
+ let parent = icon.get_parent();
+ if (parent)
+ parent.destroy();
+- icon.destroy();
++ if (!parent || !versionAtLeast('3.30', Config.PACKAGE_VERSION))
++ icon.destroy();
+ icons.splice(icons.indexOf(icon), 1);
+
+ if (icons.length === 0)
+@@ -389,3 +391,21 @@ function setSpacing() {
+ iconsBoxLayout.set_style('spacing: ' + boxLayoutSpacing + 'px; margin_top: 2px; margin_bottom: 2px;');
+
+ }
++
++// Code copied from PanelOSD extension (GPL 2.0)
++function versionAtLeast(atleast, current) {
++ let currentArray = current.split('.');
++ let major = currentArray[0];
++ let minor = currentArray[1];
++ let point = currentArray[2];
++ let atleastArray = atleast.split('.');
++ if ((atleastArray[0] < major) ||
++ (atleastArray[0] == major &&
++ atleastArray[1] < minor) ||
++ (atleastArray[0] == major &&
++ atleastArray[1] == minor) &&
++ (atleastArray[2] == undefined ||
++ atleastArray[2] <= point))
++ return true;
++ return false;
++}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild
new file mode 100644
index 00000000000..66bb954bfdb
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+ dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+ app-eselect/eselect-gnome-shell-extensions
+ >=gnome-base/gnome-shell-3.16
+"
+DEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+ # https://github.com/phocean/TopIcons-plus/commit/e883e62a36c342bdf2e31af9d328b10f4ce61112
+ "${FILESDIR}"/${P}-exit-stacktrace.patch
+)
+
+#src_compile() {
+ # It redoes this with "make install" later due to a dumb Makefile, so don't bother
+ #make build
+#}
+
+src_install() {
+ # TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+ make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
+ rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+ # Assuming it needs only compiled gettext catalogs at runtime
+ rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions-topicons-plus/files/, ...
@ 2020-03-02 16:35 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2020-03-02 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 1fd5a98ac0b6f26bcde5ab7916716369ce26d990
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 2 16:24:38 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Mar 2 16:35:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fd5a98a
gnome-extra/gnome-shell-extensions-topicons-plus: add snapshot for 3.34 compatibility
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../gnome-shell-extensions-topicons-plus/Manifest | 1 +
.../files/restore-3.22-compat.patch | 42 +++++++++++++++++++
...ll-extensions-topicons-plus-22_p20190929.ebuild | 49 ++++++++++++++++++++++
3 files changed, 92 insertions(+)
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index 4fec0da8f31..7875895145f 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -1 +1,2 @@
DIST gnome-shell-extensions-topicons-plus-22.tar.gz 2757811 BLAKE2B 8bfe719d4a0e4d58db9b21d354e841ea69b88d82c69ba6aa4ebc8db65acde9330553487d0a0d3b623d5a6a2a18ff67e6ad4e45133c6e7b8a77e07bd90c589e63 SHA512 f0589bd8ed6697d616772ab374e9aa80779512d38c50f82c375820c02c06ef26a50b2a8c78c4e5fab5dc8588ed5fdcf0b7e73e7868af0855545528e741aa280d
+DIST gnome-shell-extensions-topicons-plus-22_p20190929.tar.gz 2759460 BLAKE2B 2eb001f472395ade58503a860d3ea8248bb8aeb36b4d6f13f65e1074694aecc02f814d18d449206e1055984177896ac787fd925b4cf2680f226ffaace042cc5d SHA512 47cb156f7a61780a53311855d716c4e4f539832080fc011db634b472b5a8aa0e9fad5b6f44bf2da30665cd97b850725822ee9fb9ed9da014388cf4adeee60fbe
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch b/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch
new file mode 100644
index 00000000000..9d3104a7da5
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch
@@ -0,0 +1,42 @@
+From 0a357137c27d3e1f2f236a1e76e7b38f6e39d846 Mon Sep 17 00:00:00 2001
+From: "Robin A. Meade" <robin.a.meade@gmail.com>
+Date: Thu, 31 Oct 2019 16:08:24 -1000
+Subject: [PATCH] Fix TopIcons no longer working with gnome-shell < 3.33.90
+
+This fixes the following error:
+gnome-shell: JS ERROR: TypeError: Main.extensionManager is undefined
+onTrayIconAdded@/usr/share/gnome-shell/extensions/TopIcons@phocean.net/extension.js:85:1
+
+Related:
+https://github.com/phocean/TopIcons-plus/commit/43f991d1533e8d4002bd25ae6afd8a1568c39b36#diff-06f1274e40de25abda72d812b1cce86a
+https://bugzilla.redhat.com/show_bug.cgi?id=1767544
+---
+ extension.js | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/extension.js b/extension.js
+index 191fa5c..116a60b 100644
+--- a/extension.js
++++ b/extension.js
+@@ -82,9 +82,18 @@ function onTrayIconAdded(o, icon, role, delay=1000) {
+ // loop through the array and hide the extension if extension X is enabled and corresponding application is running
+ let iconWmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
+ for (let [wmClass, uuid] of blacklist) {
+- if (Main.extensionManager.lookup(uuid) &&
+- iconWmClass === wmClass)
+- return;
++ if (Main.extensionManager === undefined) {
++ // For gnome-shell < 3.33.90
++ if (ExtensionUtils.extensions[uuid] !== undefined &&
++ ExtensionUtils.extensions[uuid].state === 1 &&
++ iconWmClass === wmClass)
++ return;
++ } else {
++ // For gnome-shell >= 3.33.90
++ if (Main.extensionManager.lookup(uuid) &&
++ iconWmClass === wmClass)
++ return;
++ }
+ }
+
+ let iconContainer = new St.Button({child: icon, visible: false});
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
new file mode 100644
index 00000000000..31bf7980e4f
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT_HASH="ad2dd1ad48ad9a5899e14a9e0873244a3e15b82e"
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/TopIcons-plus-${COMMIT_HASH}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+DEPEND="
+ dev-libs/glib:2
+"
+RDEPEND="${DEPEND}
+ app-eselect/eselect-gnome-shell-extensions
+ >=gnome-base/gnome-shell-3.16
+"
+BDEPEND=""
+
+PATCHES=(
+ "${FILESDIR}"/restore-3.22-compat.patch # https://github.com/phocean/TopIcons-plus/pull/136
+)
+
+#src_compile() {
+ # It redoes this with "make install" later due to a dumb Makefile, so don't bother
+ #make build
+#}
+
+src_install() {
+ # TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+ make install INSTALL_PATH="${ED}/usr/share/gnome-shell/extensions/"
+ rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+ # Assuming it needs only compiled gettext catalogs at runtime
+ rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions-topicons-plus/files/, ...
@ 2020-07-04 15:07 Mart Raudsepp
0 siblings, 0 replies; 3+ messages in thread
From: Mart Raudsepp @ 2020-07-04 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 4cf531db42d9c55bcf7b90fc39e8cb0aa61d0dd6
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 4 14:42:41 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 15:05:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf531db
gnome-extra/gnome-shell-extensions-topicons-plus: remove old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../gnome-shell-extensions-topicons-plus/Manifest | 1 -
.../files/restore-3.22-compat.patch | 42 -------------------
...ll-extensions-topicons-plus-22_p20190929.ebuild | 49 ----------------------
3 files changed, 92 deletions(-)
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
index fd2ba0ff5b3..ef0c85fa4d1 100644
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
@@ -1,2 +1 @@
-DIST gnome-shell-extensions-topicons-plus-22_p20190929.tar.gz 2759460 BLAKE2B 2eb001f472395ade58503a860d3ea8248bb8aeb36b4d6f13f65e1074694aecc02f814d18d449206e1055984177896ac787fd925b4cf2680f226ffaace042cc5d SHA512 47cb156f7a61780a53311855d716c4e4f539832080fc011db634b472b5a8aa0e9fad5b6f44bf2da30665cd97b850725822ee9fb9ed9da014388cf4adeee60fbe
DIST gnome-shell-extensions-topicons-plus-27.tar.gz 2759687 BLAKE2B 854e5c8c1f749bdb3d8b83ac98d39ddcf22cfbe7221601a80b7b961c1d0dbe8ee2242ec5378c409c786957ff47602a7828fca55a09e7fa6225d4477a156a61de SHA512 3df28397bcefda7a43e6eaa520629f08a3538c98675243af2b1e109ec913d70b55f142169ad0035d0d29cacdf8f2c908eedf222e852591ed1dd5b6aa6b34591e
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch b/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch
deleted file mode 100644
index 9d3104a7da5..00000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/files/restore-3.22-compat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0a357137c27d3e1f2f236a1e76e7b38f6e39d846 Mon Sep 17 00:00:00 2001
-From: "Robin A. Meade" <robin.a.meade@gmail.com>
-Date: Thu, 31 Oct 2019 16:08:24 -1000
-Subject: [PATCH] Fix TopIcons no longer working with gnome-shell < 3.33.90
-
-This fixes the following error:
-gnome-shell: JS ERROR: TypeError: Main.extensionManager is undefined
-onTrayIconAdded@/usr/share/gnome-shell/extensions/TopIcons@phocean.net/extension.js:85:1
-
-Related:
-https://github.com/phocean/TopIcons-plus/commit/43f991d1533e8d4002bd25ae6afd8a1568c39b36#diff-06f1274e40de25abda72d812b1cce86a
-https://bugzilla.redhat.com/show_bug.cgi?id=1767544
----
- extension.js | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/extension.js b/extension.js
-index 191fa5c..116a60b 100644
---- a/extension.js
-+++ b/extension.js
-@@ -82,9 +82,18 @@ function onTrayIconAdded(o, icon, role, delay=1000) {
- // loop through the array and hide the extension if extension X is enabled and corresponding application is running
- let iconWmClass = icon.wm_class ? icon.wm_class.toLowerCase() : '';
- for (let [wmClass, uuid] of blacklist) {
-- if (Main.extensionManager.lookup(uuid) &&
-- iconWmClass === wmClass)
-- return;
-+ if (Main.extensionManager === undefined) {
-+ // For gnome-shell < 3.33.90
-+ if (ExtensionUtils.extensions[uuid] !== undefined &&
-+ ExtensionUtils.extensions[uuid].state === 1 &&
-+ iconWmClass === wmClass)
-+ return;
-+ } else {
-+ // For gnome-shell >= 3.33.90
-+ if (Main.extensionManager.lookup(uuid) &&
-+ iconWmClass === wmClass)
-+ return;
-+ }
- }
-
- let iconContainer = new St.Button({child: icon, visible: false});
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
deleted file mode 100644
index 90c74ea49a0..00000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22_p20190929.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT_HASH="ad2dd1ad48ad9a5899e14a9e0873244a3e15b82e"
-DESCRIPTION="Moves legacy tray icons to top panel"
-HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
-SRC_URI="https://github.com/phocean/TopIcons-plus/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/TopIcons-plus-${COMMIT_HASH}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-DEPEND="
- dev-libs/glib:2
-"
-RDEPEND="${DEPEND}
- app-eselect/eselect-gnome-shell-extensions
- >=gnome-base/gnome-shell-3.16
-"
-BDEPEND=""
-
-PATCHES=(
- "${FILESDIR}"/restore-3.22-compat.patch # https://github.com/phocean/TopIcons-plus/pull/136
-)
-
-#src_compile() {
- # It redoes this with "make install" later due to a dumb Makefile, so don't bother
- #make build
-#}
-
-src_install() {
- # TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
- make install INSTALL_PATH="${ED}/usr/share/gnome-shell/extensions/"
- rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
- # Assuming it needs only compiled gettext catalogs at runtime
- rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
- dodoc README.md
-}
-
-pkg_postinst() {
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-04 15:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-14 11:51 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/gnome-shell-extensions-topicons-plus/files/, Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-03-02 16:35 Mart Raudsepp
2020-07-04 15:07 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox