[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/files/

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/files/

[Petr Vaněk]

commit:     aba0738aea3c2d57bcc563953498568584a3fb66
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Mar  4 18:29:31 2024 +0000
Commit:     Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Mar  5 09:17:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba0738a

x11-wm/mutter: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/35622
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>

 .../mutter/files/mutter-45.2-fullscreen-leak.patch | 37 ----------------------
 1 file changed, 37 deletions(-)

diff --git a/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch b/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch
deleted file mode 100644
index adbd309c1b7c..000000000000
--- a/x11-wm/mutter/files/mutter-45.2-fullscreen-leak.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bedf8df88f41c34c9824dccba507c8e333dd9ba6 Mon Sep 17 00:00:00 2001
-From: Robert Balas <bluew@r14s.ch>
-Date: Mon, 4 Dec 2023 00:27:49 +0100
-Subject: [PATCH] clutter: Fix memory leak when running in fullscreen
-
-`clutter_stage_do_paint_view()` only gets called when leaving fullscreen
-and by that time enough calls to
-`clutter_actor_get_transformed_paint_volume()` can make the underlying
-GArray grow to a large size.
-
-To fix this, we call call the cleanup function in
-`clutter_stage_finish_layout()` to make it happen every frame.
-
-Co-authored-by: Sebastian Keller <skeller@gnome.org>
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3191
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3439>
----
- clutter/clutter/clutter-stage.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c
-index 55bb81c2b46..deb383fe216 100644
---- a/clutter/clutter/clutter-stage.c
-+++ b/clutter/clutter/clutter-stage.c
-@@ -970,6 +970,8 @@ clutter_stage_finish_layout (ClutterStage *stage)
-     }
- 
-   g_warn_if_fail (!priv->actor_needs_immediate_relayout);
-+
-+  _clutter_stage_paint_volume_stack_free_all (stage);
- }
- 
- void
--- 
-GitLab
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/files/

[Matt Turner]

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 <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
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/mutter/files/

[Aaron Bauman]

commit:     fee80bd4c30923a54275d830d3def703cdf73ccf
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon May 20 17:21:15 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 19:38:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee80bd4

x11-wm/mutter: remove unused patches

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12062
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 x11-wm/mutter/files/3.24.4-build-debug.patch | 28 -----------------------
 x11-wm/mutter/files/3.24.4-gudev-232.patch   | 33 ----------------------------
 2 files changed, 61 deletions(-)

diff --git a/x11-wm/mutter/files/3.24.4-build-debug.patch b/x11-wm/mutter/files/3.24.4-build-debug.patch
deleted file mode 100644
index 6cb7b48856f..00000000000
--- a/x11-wm/mutter/files/3.24.4-build-debug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c9937faf1e2c81005289e18974ed5d10b2dc37ab Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Sat, 12 Aug 2017 11:52:28 +0200
-Subject: [PATCH] clutter: Fix build with --enable-debug
-
-Message was poking stage_x11, which doesn't exist in this context.
-Just print the Window that is receiving the event, the event will be
-emitted into the only existing stage anyway.
----
- clutter/clutter/x11/clutter-device-manager-xi2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clutter/clutter/x11/clutter-device-manager-xi2.c b/clutter/clutter/x11/clutter-device-manager-xi2.c
-index 1ecec02..da3457a 100644
---- a/clutter/clutter/x11/clutter-device-manager-xi2.c
-+++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
-@@ -1160,7 +1160,7 @@ translate_pad_event (ClutterEvent       *event,
-                 event->any.type == CLUTTER_PAD_RING
-                 ? "pad ring  "
-                 : "pad strip",
--                (unsigned int) stage_x11->xwin,
-+                (unsigned int) xev->event,
-                 device->id,
-                 device->device_name,
-                 event->any.time, value);
---
-libgit2 0.26.0
-

diff --git a/x11-wm/mutter/files/3.24.4-gudev-232.patch b/x11-wm/mutter/files/3.24.4-gudev-232.patch
deleted file mode 100644
index 5808e977c73..00000000000
--- a/x11-wm/mutter/files/3.24.4-gudev-232.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 361bf847af82c7dca097302fe64c575079280c9c Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 1 Sep 2017 02:06:38 +0200
-Subject: build: Require libgudev >= 232
-
-And remove the g_autoptr implementations in mutter itself.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=760670
-
-Gentoo: stripped configure.ac part to avoid autoreconf
----
- configure.ac                        | 4 ++--
- src/backends/native/meta-launcher.c | 4 ----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
-index 90b4b98..eb35f88 100644
---- a/src/backends/native/meta-launcher.c
-+++ b/src/backends/native/meta-launcher.c
-@@ -49,10 +49,6 @@
- 
- #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
- 
--G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevDevice, g_object_unref)
--G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevClient, g_object_unref)
--G_DEFINE_AUTOPTR_CLEANUP_FUNC(GUdevEnumerator, g_object_unref)
--
- struct _MetaLauncher
- {
-   Login1Session *session_proxy;
--- 
-cgit v0.12
-