gentoo auto-resync : 23:08:2023 - 21:49:58

3 files changed, 4 insertions, 81 deletions

diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index ad53aeac5297..b51d3e6b98a9 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,6 +1,5 @@
-AUX gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch 2620 BLAKE2B adb6c604df20f6730eefc5898f651c6d1f6b3c2b70014b83e6a067b79187525f36ce1d9ca1cd36721914e86fc710a212abc117750c725d6939610660f5572e4d SHA512 78a7c989788766ac3245496b1c66356747f0cb04a7db5b67738caa9afcda56c2daa6d388ff03238bd6392cfde120ec540f1aa370e1460eaf0517932dcb06b985
-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
-EBUILD gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild 1037 BLAKE2B 64a39a8ce0e7c4db0d029b22338c7a75357223906a286cb12c0c39867fd9d89e786b81b58e03c94fa05e5cf038188b0bf0f3523b4a94368c098515d2fda2720e SHA512 822cdc94032b875214ad17bea45979eba1aa9ec6c83ca3055ec8ae44d099110ec0fbe6394e42035000c019e41f5092cc05706748f076afcbf187766a4b817d28
+DIST gnome-shell-extension-desktop-icons-ng-47.0.4.tar.bz2 152300 BLAKE2B ddc07a03316ea4483e90253009576a8a0398a682545325b4adfd48d1b0a271bebf481d7223acd28909c91797bb7d0153d02871b6265f1f4f64a49d60dc5a4766 SHA512 83b24b2c4a849b7778865c8dca8707334937377816b931932ac1b775ddbef6c613e4a73d38a3869ec782d968722405414dfdf3d768a23dcbbf11f502024b9f81
 EBUILD gnome-shell-extension-desktop-icons-ng-47.0.3.ebuild 990 BLAKE2B a64b55d8116cc6127a6168c39035411a1d8930d8207cdc3a2a3a4accbd4bc412b75ae4e6f0e6cae1029c90dfb7d03f63d2b0b9d73b3b7a35309c2ab5f50bf497 SHA512 be536e007c2fc0237bf2e68a814535b50ad5808fd1ca5efe35605cfbd744f33e6bdd65514908b98acf5c539e7ab79c9a8e8638eaae8b2f391080510c36a2fd52
+EBUILD gnome-shell-extension-desktop-icons-ng-47.0.4.ebuild 992 BLAKE2B d1c21075d6e7531f4d93077fb6cc5bd4410eb58f7504a678a46c98558816f07fa9bdb3f0c163111805b59e323cd0f68cd4530b28a6c9f8644eb9b3d094923c8a SHA512 7592ca64fb1b3e612b14249e52b335b85112466c148d3b1259339c1febec34abaaaf4361ee8529b4cdfb3b96af6686414ca27d85446f69becb86655195137374
 MISC metadata.xml 333 BLAKE2B 3bc225ba5cd8ccbe497b7f1494e7ee2ebb8d43a59756dfbc5a6152a1fdb0027f02e1057f6b1bfa6fe8d97b4a2583611b45e0d27bfb37a1a5563246d411eb057d SHA512 f835b8b301a79f5bc650c75cfc0c52eb0ddba2266c04c559f2651fa429d1747af98ea0b8e7775ff3df6d5d8b7ee545f22a89d092138fc91e19fcd0d5e325f315
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 <daniel.van.vugt@canonical.com>
-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 <daniel.van.vugt@canonical.com>
-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": "ding@rastersoft.com",
-     "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.4.ebuild
index b95780088fc7..60a6ba4b998c 100644
--- 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.4.ebuild
@@ -6,7 +6,7 @@ inherit gnome2-utils meson
 
 MY_PN="desktop-icons-ng"
 MY_P="${MY_PN}-${PV}"
-COMMIT="9c2f2bc688e9c95335c64f1b3a6ad0cc2051d7b4"
+COMMIT="3fe71de83a0a6e11d3f14bf5f61aa4e757def461"
 
 DESCRIPTION="Fork from the desktop-icons project, with several enhancements like Drag'n'Drop"
 HOMEPAGE="https://gitlab.com/rastersoft/desktop-icons-ng"
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/-/archive/${PV}/${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
@@ -28,10 +28,6 @@ BDEPEND=""
 
 S="${WORKDIR}/${MY_P}-${COMMIT}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-gnome44.patch"
-)
-
 pkg_preinst() {
 	gnome2_schemas_savelist
 }