commit: 10f493c1184d89d0dd05b617523eabba846c1653 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Apr 25 15:15:32 2023 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Apr 25 15:20:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f493c1
x11-wm/mutter: Update no-screencast patch Closes: https://github.com/gentoo/gentoo/pull/30401 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../files/mutter-44.0-no-screencast-build.patch | 48 +++++++++++++++++++--- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/x11-wm/mutter/files/mutter-44.0-no-screencast-build.patch b/x11-wm/mutter/files/mutter-44.0-no-screencast-build.patch index 85b95164a65a..4544a72f1e7e 100644 --- a/x11-wm/mutter/files/mutter-44.0-no-screencast-build.patch +++ b/x11-wm/mutter/files/mutter-44.0-no-screencast-build.patch @@ -1,22 +1,45 @@ https://bugs.gentoo.org/901809 https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2935 -From 2c1eee4d0a27439e97ff5dee541ad138aa75aaed Mon Sep 17 00:00:00 2001 +From 28a599631de8fbbf28777e5238da1d7addcc0d56 Mon Sep 17 00:00:00 2001 From: Chris Mayo <aklh...@gmail.com> -Date: Sat, 25 Mar 2023 17:22:01 +0000 +Date: Sat, 1 Apr 2023 18:02:56 +0100 Subject: [PATCH] backend: Fix build with -Dremote_desktop=false MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -../mutter-44.0/src/backends/meta-backend.c: In function ‘meta_backend_real_post_init’: -../mutter-44.0/src/backends/meta-backend.c:560:7: error: ‘MetaBackendPrivate’ {aka ‘struct _MetaBackendPrivate’} has no member named ‘remote_access_controller’ +../mutter-44.0/src/backends/meta-backend.c: In function ‘meta_backend_real_post_init’: +../mutter-44.0/src/backends/meta-backend.c:560:7: error: ‘MetaBackendPrivate’ {aka ‘struct _MetaBackendPrivate’} has no member named ‘remote_access_controller’ 560 | priv->remote_access_controller = | ^~ Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2655 +Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2935> +--- + src/backends/meta-backend.c | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c +index d278e6a85..e77b9612b 100644 --- a/src/backends/meta-backend.c +++ b/src/backends/meta-backend.c +@@ -63,6 +63,7 @@ + #include "backends/meta-input-settings-private.h" + #include "backends/meta-logical-monitor.h" + #include "backends/meta-monitor-manager-dummy.h" ++#include "backends/meta-remote-access-controller-private.h" + #include "backends/meta-settings-private.h" + #include "backends/meta-stage-private.h" + #include "backends/x11/meta-backend-x11.h" +@@ -77,7 +78,6 @@ + #include "meta/util.h" + + #ifdef HAVE_REMOTE_DESKTOP +-#include "backends/meta-remote-access-controller-private.h" + #include "backends/meta-remote-desktop.h" + #include "backends/meta-screen-cast.h" + #endif @@ -134,8 +134,8 @@ struct _MetaBackendPrivate #endif MetaSettings *settings; @@ -27,5 +50,20 @@ Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2655 MetaScreenCast *screen_cast; MetaRemoteDesktop *remote_desktop; #endif +@@ -1410,13 +1410,9 @@ meta_backend_get_screen_cast (MetaBackend *backend) + MetaRemoteAccessController * + meta_backend_get_remote_access_controller (MetaBackend *backend) + { +-#ifdef HAVE_REMOTE_DESKTOP + MetaBackendPrivate *priv = meta_backend_get_instance_private (backend); + + return priv->remote_access_controller; +-#else +- return NULL; +-#endif + } + + /** -- -GitLab +2.39.2 +
