gentoo auto-resync : 05:05:2023 - 17:31:39

4 files changed, 124 insertions, 2 deletions

diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 0382864a9ddf..5bf820e62e21 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -1,5 +1,7 @@
+AUX gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch 2620 BLAKE2B adb6c604df20f6730eefc5898f651c6d1f6b3c2b70014b83e6a067b79187525f36ce1d9ca1cd36721914e86fc710a212abc117750c725d6939610660f5572e4d SHA512 78a7c989788766ac3245496b1c66356747f0cb04a7db5b67738caa9afcda56c2daa6d388ff03238bd6392cfde120ec540f1aa370e1460eaf0517932dcb06b985
 DIST ding-47.tar.xz 137520 BLAKE2B afadc7db89024104bddc3ca6842552482db9e011d5d562f47ecabcffd6593d467a5ed248a494000688eced97c0931e4b8964eb8eee23aac8c234531e3a257a92 SHA512 1e9d1ee1d214ce62dded6c6bd42ff1f2ffc08f777f5a569bf84cfb775d55933d908289c9d23325ff227fc08a2b47c2fc3be6434d48fb8230ffb6f39b25cd7ec7
 DIST gnome-shell-extension-desktop-icons-ng-47.0.2.tar.bz2 149883 BLAKE2B 9097ea9489ea220297082e487bd846dfe0b7d2188fc878bb4927e92ddc8aabe21ee2b4acfad91b95694713b90c3c99c82eae2f184bd985228cbe2f7f5c61aaf7 SHA512 220a2c4337f47d196d81cb21df80e1d5cd34778f3f14cf33f51baeb6156309244977acb9d5981e588ed68060b7c47c2d567f6ba5f835c2af4a537bd70a87daa2
-EBUILD gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild 992 BLAKE2B 618c284be474adf123040062d5104b6369189bb1ca75ef4e3f6b488ace07761059cb77105c1b691cb9c3a0a255bb817f29b3c6bb10751adb3fff0db430408c4c SHA512 4a3680f057ae837b25e9839d6ce3c99006a09bf408a67259a5d56871fa347eb45d57df013def45318ab2954d4241a654d6ddd52da2fab5ac4eb5ceb287acd76b
+EBUILD gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild 1037 BLAKE2B 64a39a8ce0e7c4db0d029b22338c7a75357223906a286cb12c0c39867fd9d89e786b81b58e03c94fa05e5cf038188b0bf0f3523b4a94368c098515d2fda2720e SHA512 822cdc94032b875214ad17bea45979eba1aa9ec6c83ca3055ec8ae44d099110ec0fbe6394e42035000c019e41f5092cc05706748f076afcbf187766a4b817d28
+EBUILD gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild 990 BLAKE2B 3417f0ce42ccb2f97b63ea3b7f76eed01dffe9e6ec20bc1338fff075c189c12e907a72531f54918f59c814043aaa06cc4da2b90af7ba7093e29559da35f1816b SHA512 1c9237b2dc01ef6437ceb8456aba3e17bff4d09bb873d250eae99f6596f7d10836d04968b62694a3f712a59540004454fbb37b5e567c9c3bc87d155d0864ad7c
 EBUILD gnome-shell-extension-desktop-icons-ng-47.ebuild 1001 BLAKE2B 3b684a28652088b5619b00193a7c983b19dd3dd8b4eec9729dfe6700a5edbd1fcc56df2b3ffd8da45330392d77517743573d6ba6628b027193d78a1a804b861a SHA512 c8161652735d9bddc54fd09ed073919ee09337f0d4171fa3ad77e386667e801564c02877ce487a99a6d72ec1b32d908c1cfe94130510603a3b9ed6e8faf07ea8
 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
new file mode 100644
index 000000000000..1dcce817e484
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/files/gnome-shell-extension-desktop-icons-ng-47.0.2-gnome44.patch
@@ -0,0 +1,72 @@
+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.2-r1.ebuild
new file mode 100644
index 000000000000..b95780088fc7
--- /dev/null
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2-r1.ebuild
@@ -0,0 +1,48 @@
+# 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
+}
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild
index 092c49db2cec..9c01b6718ed3 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-47.0.2.ebuild
@@ -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"