From 3179df61703cb05d2083ec83b2a5ecb2c0d9c781 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Thu, 9 May 2024 23:34:34 +0200 Subject: gnome-shell: correct regression with glib-2.0 2.78.5 Backport fix to work with new glib-2.0. Signed-off-by: Peter Marko Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- ...ast-Correct-expected-bus-name-for-streams.patch | 38 ++++++++++++++++++++++ .../recipes-gnome/gnome-shell/gnome-shell_46.1.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch new file mode 100644 index 0000000000..736594716a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0002-screencast-Correct-expected-bus-name-for-streams.patch @@ -0,0 +1,38 @@ +From 50a011a19dcc6997ea6173c07bb80b2d9888d363 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 6 May 2024 21:58:09 +0100 +Subject: [PATCH] screencast: Correct expected bus name for streams +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Previously, this only worked because GDBusConnection was not filtering +signals by their sender correctly (GNOME/glib#3268). + +Thanks: Alicia Boya García +Signed-off-by: Simon McVittie +Part-of: + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/50a011a19dcc6997ea6173c07bb80b2d9888d363] + +Signed-off-by: Peter Marko +--- + js/dbusServices/screencast/screencastService.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/js/dbusServices/screencast/screencastService.js b/js/dbusServices/screencast/screencastService.js +index d664a51b083..0645811fa0a 100644 +--- a/js/dbusServices/screencast/screencastService.js ++++ b/js/dbusServices/screencast/screencastService.js +@@ -340,7 +340,7 @@ class Recorder extends Signals.EventEmitter { + }); + + this._streamProxy = new ScreenCastStreamProxy(Gio.DBus.session, +- 'org.gnome.ScreenCast.Stream', ++ 'org.gnome.Mutter.ScreenCast', + streamPath); + + this._streamProxy.connectSignal('PipeWireStreamAdded', +-- +2.30.2 + diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb index ed86cbcb6a..1bc9b6b394 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.1.bb @@ -34,6 +34,7 @@ REQUIRED_DISTRO_FEATURES += "gobject-introspection-data" SRC_URI[archive.sha256sum] = "64f999844c101e63bf294d45b138de56319ad2f326282721aad0fa860653b369" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" +SRC_URI += "file://0002-screencast-Correct-expected-bus-name-for-streams.patch" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" -- cgit v1.2.3-54-g00ecf