Merge pull request #228301 from bobby285271/upd/mutter43

gnome.mutter43: 43.4 → 43.5

2 files changed, 2 insertions, 35 deletions

diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix
index 5953d00de45f..318c12a9ebdb 100644
--- a/pkgs/desktops/gnome/core/mutter/43/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/43/default.nix
@@ -50,13 +50,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "43.4";
+  version = "43.5";
 
   outputs = [ "out" "dev" "man" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    sha256 = "FiU2cxEaLsyW/I0tFfrdobVU0B3CioMEE11J1rqHsUA=";
+    sha256 = "/JAP4ahA2aeTyOLSDUTJCqCH1fv9x5Su5wluHYoJZxo=";
   };
 
   patches = [
@@ -66,14 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/285a5a4d54ca83b136b787ce5ebf1d774f9499d5.patch";
       sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
     })
-
-    # GLib 2.76 switches from using its own slice allocator to using the system malloc instead.
-    # This makes dragging window between workspace in multitasking view crashes Pantheon's Gala.
-    # Inspiration https://github.com/mate-desktop/mate-desktop/pull/538
-    # Backtrace https://github.com/elementary/gala/issues/1580
-    # Upstream report https://gitlab.gnome.org/GNOME/mutter/-/issues/2495
-    # The patch will not apply on 44.0+, make sure this is fixed when trying to clean this up.
-    ./glib-2-76-gala-crash.patch
   ];
 
   mesonFlags = [
diff --git a/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch b/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch
deleted file mode 100644
index 895cabcdbdb4..000000000000
--- a/pkgs/desktops/gnome/core/mutter/43/glib-2-76-gala-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
-index d34c8f59f..8835a6a33 100644
---- a/clutter/clutter/clutter-actor.c
-+++ b/clutter/clutter/clutter-actor.c
-@@ -12304,7 +12304,7 @@ clutter_actor_run_actions (ClutterActor       *self,
-                            ClutterEventPhase   phase)
- {
-   ClutterActorPrivate *priv;
--  const GList *actions, *l;
-+  const GList *actions, *l, *next;
-   gboolean retval = CLUTTER_EVENT_PROPAGATE;
- 
-   priv = self->priv;
-@@ -12313,9 +12313,10 @@ clutter_actor_run_actions (ClutterActor       *self,
- 
-   actions = _clutter_meta_group_peek_metas (priv->actions);
- 
--  for (l = actions; l; l = l->next)
-+  for (l = actions; l; l = next)
-     {
-       ClutterAction *action = l->data;
-+      next = l->next;
-       ClutterEventPhase action_phase;
- 
-       action_phase = clutter_action_get_phase (action);