commit: 6be39c1eb3e7b1d2cf5f2bcf0e5c6cc2cdb964ad Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Wed Aug 23 14:39:26 2023 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Wed Aug 23 14:48:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be39c1e
gnome-extra/gnome-shell-extension-desktop-icons-ng: drop 47.0.2-r1 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org> .../Manifest | 1 - ...extension-desktop-icons-ng-47.0.2-gnome44.patch | 72 ---------------------- ...ell-extension-desktop-icons-ng-47.0.2-r1.ebuild | 48 --------------- 3 files changed, 121 deletions(-) diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest index 32f52c319d58..5f446af48ad2 100644 --- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest +++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest @@ -1,3 +1,2 @@ -DIST gnome-shell-extension-desktop-icons-ng-47.0.2.tar.bz2 149883 BLAKE2B 9097ea9489ea220297082e487bd846dfe0b7d2188fc878bb4927e92ddc8aabe21ee2b4acfad91b95694713b90c3c99c82eae2f184bd985228cbe2f7f5c61aaf7 SHA512 220a2c4337f47d196d81cb21df80e1d5cd34778f3f14cf33f51baeb6156309244977acb9d5981e588ed68060b7c47c2d567f6ba5f835c2af4a537bd70a87daa2 DIST gnome-shell-extension-desktop-icons-ng-47.0.3.tar.bz2 151631 BLAKE2B 652e41eff5f8ada6bd2f6ebf49fd4db08bcab6d48af0e42e789a52050049708596fd534b9a32906cab2e4a8ccd283cc88ea318b4f7f58b1ef5bfd638399d92cf SHA512 0d48e442efc9ea2c461ec846a38c06ea906f6c3c710c221af693a9819efecc8859c86116f13172caba0083f4fcb9015c2957587e3a2a6f531d1e8f414c5dcb47 DIST gnome-shell-extension-desktop-icons-ng-47.0.4.tar.bz2 152300 BLAKE2B ddc07a03316ea4483e90253009576a8a0398a682545325b4adfd48d1b0a271bebf481d7223acd28909c91797bb7d0153d02871b6265f1f4f64a49d60dc5a4766 SHA512 83b24b2c4a849b7778865c8dca8707334937377816b931932ac1b775ddbef6c613e4a73d38a3869ec782d968722405414dfdf3d768a23dcbbf11f502024b9f81 diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/files/gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch b/gnome-extra/gnome-shell-extension-desktop-icons-ng/files/gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch deleted file mode 100644 index 1dcce817e484..000000000000 --- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/files/gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 6a2787f5500c50162933de88d09bc20e7b0718b9 Mon Sep 17 00:00:00 2001 -From: Daniel van Vugt <[email protected]> -Date: Fri, 3 Feb 2023 15:20:52 +0800 -Subject: [PATCH 1/2] extension: Attempt Mutter 44 API if the old one fails - -There is no other way to detect this nicely. The API changed in -Mutter 44 but the shell version is still advertised as 43.1 at time of -writing, and there are no new exports we can look for in the offending -mutter commit. So just try both APIs. - -Fixes: https://launchpad.net/bugs/2004623 ---- - extension.js | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/extension.js b/extension.js -index 138ba4ca..db3f13a6 100644 ---- a/extension.js -+++ b/extension.js -@@ -19,6 +19,7 @@ - const GLib = imports.gi.GLib; - const Gio = imports.gi.Gio; - const Meta = imports.gi.Meta; -+const Shell = imports.gi.Shell; - const St = imports.gi.St; - - const Main = imports.ui.main; -@@ -489,7 +490,14 @@ var LaunchSubprocess = class { - this.cancellable = new Gio.Cancellable(); - this._launcher = new Gio.SubprocessLauncher({flags: flags | Gio.SubprocessFlags.STDOUT_PIPE | Gio.SubprocessFlags.STDERR_MERGE}); - if (Meta.is_wayland_compositor()) { -- this._waylandClient = Meta.WaylandClient.new(this._launcher); -+ try { -+ this._waylandClient = Meta.WaylandClient.new(this._launcher); -+ } catch (e) { -+ let context = Shell.Global.get().context; -+ this._waylandClient = Meta.WaylandClient.new(context, -+ this._launcher); -+ } -+ - if (Config.PACKAGE_VERSION == '3.38.0') { - // workaround for bug in 3.38.0 - this._launcher.ref(); --- -GitLab - - -From 5671fea5ab89e2b79b22a11cc1ca936e6fb85505 Mon Sep 17 00:00:00 2001 -From: Daniel van Vugt <[email protected]> -Date: Fri, 3 Feb 2023 15:24:00 +0800 -Subject: [PATCH 2/2] metadata: When GNOME 44 comes, we're ready. - ---- - metadata.json | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/metadata.json b/metadata.json -index ffd85e4e..32eac471 100644 ---- a/metadata.json -+++ b/metadata.json -@@ -1,7 +1,7 @@ - { - "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", - "name": "Desktop Icons NG (DING)", -- "shell-version": ["3.38", "40", "41", "42", "43"], -+ "shell-version": ["3.38", "40", "41", "42", "43", "44"], - "uuid": "[email protected]", - "url": "https://gitlab.com/rastersoft/desktop-icons-ng"; - } --- -GitLab - diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild deleted file mode 100644 index b95780088fc7..000000000000 --- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit gnome2-utils meson - -MY_PN="desktop-icons-ng" -MY_P="${MY_PN}-${PV}" -COMMIT="9c2f2bc688e9c95335c64f1b3a6ad0cc2051d7b4" - -DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop" -HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"; -SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/${PV}/${P}.tar.bz2"; - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -COMMON_DEPEND="dev-libs/glib:2" -RDEPEND="${COMMON_DEPEND} - app-eselect/eselect-gnome-shell-extensions - >=gnome-base/gnome-shell-3.38 - >=gnome-base/nautilus-3.38 -" -DEPEND="${COMMON_DEPEND}" -BDEPEND="" - -S="${WORKDIR}/${MY_P}-${COMMIT}" - -PATCHES=( - "${FILESDIR}/${P}-gnome44.patch" -) - -pkg_preinst() { - gnome2_schemas_savelist -} - -pkg_postinst() { - gnome2_schemas_update - ebegin "Updating list of installed extensions" - eselect gnome-shell-extensions update - eend $? -} - -pkg_postrm() { - gnome2_schemas_update -}
