Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gnome.mutter42: 42.7 → 42.9 #222374

Closed
wants to merge 2 commits into from
Closed

gnome.mutter42: 42.7 → 42.9 #222374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef2e976
gnome.mutter42: 42.7 → 42.9
bobby285271 Mar 21, 2023
5d8551c
gnome.mutter42: Apply fixes for GLib 2.76
bobby285271 Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions pkgs/desktops/gnome/core/mutter/42/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@

let self = stdenv.mkDerivation rec {
pname = "mutter";
version = "42.7";
version = "42.9";

outputs = [ "out" "dev" "man" ];

src = fetchurl {
url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "OwmmsHDRMHwD2EMorIS0+m1jmfk4MEo4wpTxso3yipM=";
sha256 = "0IDlLyxH+/3wMkixE1TQObSqRT8ZlyiLMK+EHW3O5sM=";
};

patches = [
Expand All @@ -66,10 +66,26 @@ let self = stdenv.mkDerivation rec {
sha256 = "/npUE3idMSTVlFptsDpZmGWjZ/d2gqruVlJKq4eF4xU=";
})

# Fix log spam "Attempting to freeze/thaw notification queue for object ClutterText".
# https://gitlab.gnome.org/GNOME/mutter/-/issues/2566
# https://github.com/linuxmint/cinnamon/issues/11562 (backported to muffin as well)
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/cff631cb39b1b9d66b791fb51a6f2c3db8e60917.patch";
sha256 = "+20GOC0yVQ1HsfGYAxZ0DEw6aTA3eHi/pq/ELKQRmbg=";
})

(substituteAll {
src = ./fix-paths.patch;
inherit zenity;
})

# 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 = [
Expand Down
25 changes: 25 additions & 0 deletions pkgs/desktops/gnome/core/mutter/42/glib-2-76-gala-crash.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
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);