gentoo auto-resync : 25:04:2023 - 18:13:05

3 files changed, 44 insertions, 6 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index daffd961e577..080f04537a39 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 0cdc1efcb833..13e5af1828a6 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,5 +1,5 @@
 AUX mutter-43.0-Disable-anonymous-file-test.patch 774 BLAKE2B 460f63fc00b895514e7c2f30dc143100b1f564d816084cf06043439d44697602f042e4905121e949c7a5397556a32815eaae9bd2d671d1fdcdb6ca863fb7d4b1 SHA512 b1a9e7c01e35c1c00f34412f7522cdd601cf3af569a571fe9353839429cf76bf6d9b847da500663834c4eae6e05031eaa4ec770ee89807978a784db4b1bc813b
-AUX mutter-44.0-no-screencast-build.patch 1214 BLAKE2B d1833aba057442427309b058fc539acc9466a087f397b1e8eda14ecfc32ca8113f5b9c7e5905c7e48377d812d5754fdb62ddc533eb79987c21e195cf461ef477 SHA512 652fc4bf83af0b7daeeea0507fd43d99a88eabc47a98db1f7cf927f69bdb2b2d9dbe33b72c04fc031509e87b483fb8b1beef5c4c7179714186e9492f37fbfb99
+AUX mutter-44.0-no-screencast-build.patch 2391 BLAKE2B c50121f4331cc1eaef577b0ec615cec024acc85f6bcdd8dc6c0d801e19485095bfd37dbf07e13fc0ccf06ec7b814ce02764276aae577d0253f528317950569b2 SHA512 41fd4fe6aea36d8c1b90bf7e1d93729b178332eff9bf1371f8f0fed00df828f4e20017505512c8295f9998ff95550a6b0a9135d728323d0ee418eed4aa218ea6
 DIST mutter-43.3.tar.xz 2782016 BLAKE2B 9a931dba410a71e67383a453c4480622fce3333ea5d7466bf05cf20b474e3cb06288ea8015bc391a77fc3a358c60282a965428c4984006a0ea8db9a7cfee2e2f SHA512 5e9d4b213ac674889af9c15dd52f79a28a1c38af57f08a19bd6b2bf78a799aaa2f6dcb76adb9fa8d6a94e21d988befc37a696bc06801c96e1f692c80a5aff2ae
 DIST mutter-43.4.tar.xz 2782136 BLAKE2B 8b1ebf42fcd0dc7b502c09f54f21454a71c1cc0a366da5306b3d088ff9bc849f561358454844e8ee40b79e878d2240714a6aeae1be424f52e7a3f7fd0d190f43 SHA512 ca80ceb9233dca0b8331e7fc8ebced67871a2ecf606a648ec9f6922f1a53db107e20446b828813fcab8234467b9325623708eff066cf8d803a6b2e5695766ccb
 DIST mutter-44.0.tar.xz 2838932 BLAKE2B 0a5ea5a45a8074face45727af5d332ef61d69180d941634bf1ab673f53cd710893ccbedd16cb7bc1a09b51120b2047105a04a8eae4fbcb3803179eba89c7d73e SHA512 c7d35e797d080f90cc43b2904bb04d2328fecd13cd7d1ab12b1db735d331b2df9501668c2e0f7a10ea3ad9821048b09cbeb7149fcda3d43f37e5a1834bb04e2b
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 <aklhfex@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
+