From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- .../gnome-shell-extensions-topicons-plus/Manifest | 2 + ...tensions-topicons-plus-22-exit-stacktrace.patch | 62 ++++++++++++++++++++++ ...ome-shell-extensions-topicons-plus-22-r1.ebuild | 49 +++++++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch create mode 100644 gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild (limited to 'gnome-extra/gnome-shell-extensions-topicons-plus') diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest index 0896b97b4e84..3a33dac32e05 100644 --- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest +++ b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest @@ -1,5 +1,7 @@ +AUX gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch 2645 BLAKE2B 3a24202c8bcb07b3ae6c6b6dccbd734d729da2f81d26bf08d5d4b5b20f7c77be0b4e958bc2e4be5b374e4f22479af85d16560c039b54328fd08138246ac58889 SHA512 4e6557e9afabedfd9ecad7383478a00dda38cd043c69023900080b194ffe7f47a0b8d64c6edda74b12339cd3f2f54d549df088493d94fa68da20f1e89e65ab5d DIST gnome-shell-extensions-topicons-plus-21.tar.gz 2756641 BLAKE2B 39414711365a9c68fa2b0172859e9969a7f71eae5e7498abee9ff05e4c215df09419cdad99192c60892b1bd6e8b27724c81c5d3da9a3d8ca3072d984824cb950 SHA512 f85db46f20c24f0b11ce2c79c0548b88262faf059d674073e328917dc8497de0e07ccd6f3613f45aa9e49109468d78293f3a8f0f4fea5a24a7c5254666cda5df DIST gnome-shell-extensions-topicons-plus-22.tar.gz 2757811 BLAKE2B 8bfe719d4a0e4d58db9b21d354e841ea69b88d82c69ba6aa4ebc8db65acde9330553487d0a0d3b623d5a6a2a18ff67e6ad4e45133c6e7b8a77e07bd90c589e63 SHA512 f0589bd8ed6697d616772ab374e9aa80779512d38c50f82c375820c02c06ef26a50b2a8c78c4e5fab5dc8588ed5fdcf0b7e73e7868af0855545528e741aa280d EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1327 BLAKE2B b8d030527a7364996f2258e5543344930ec64e2d4ff62d826f6e983c718521556f04789d9db36e121868e7227f983a473b9c53d700231470a71d9322c48b30ff SHA512 f18583531b6721b92fed2ac2b81c3ca3137331464196a05c4fad7ff02c21f33dbade7ecc657a1ed7274c5b231253f549f80b16013b8ece623773b06a3b14409e +EBUILD gnome-shell-extensions-topicons-plus-22-r1.ebuild 1473 BLAKE2B 235c02a926104fd1ccf2eb82d86bdcb47c8075674ea178186e15f0a04f3793a7054822459aa591bac790f53667aea9b5a3a8dd8eaf2422976b26b4c752f2a69e SHA512 1792e2b5e3ab079d7146be83c54310a4292b2cd2693094dd1b2dee2352356057b97cf42925d38ad8fc226463c13d56fd501c33e9f3efe4c51b80cb70eb61df74 EBUILD gnome-shell-extensions-topicons-plus-22.ebuild 1326 BLAKE2B 71981852375df8dcfe755fd9581c645234bb16f73d4007b48a4ccbc8befe7e01e7c3fb8fc0f79be1a3f145dad783da0c1a214d22bd158cbf572d3a5c3ce72382 SHA512 cdcb523a4f7a03a280ab9791da36b722e661253ba5fb315d92498b9ee6b117c36084951235d31b6fb6964696b94c04aa8245fba5492416b7eca1ce29305a395f MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40 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 000000000000..17082b4ac4fd --- /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 +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 000000000000..66bb954bfdbe --- /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 $? +} -- cgit v1.2.3