diff -Nru mutter-3.38.3/debian/changelog mutter-3.38.3/debian/changelog --- mutter-3.38.3/debian/changelog 2021-03-10 11:48:22.000000000 +0800 +++ mutter-3.38.3/debian/changelog 2021-03-18 15:50:19.000000000 +0800 @@ -1,3 +1,13 @@ +mutter (3.38.3-3ubuntu3) hirsute; urgency=medium + + * Update clutter-Use-G_PARAM_EXPLICIT_NOTIFY-for-actor-and-stage-p.patch + to remove the G_PARAM_EXPLICIT_NOTIFY flag from the "opacity" property. + Because it prevented listeners of 'notify::opacity' in gnome-shell from + running, which caused the workspaces view to appear on top of the icon + grid (LP: #1918874). + + -- Daniel van Vugt Thu, 18 Mar 2021 15:50:19 +0800 + mutter (3.38.3-3ubuntu2) hirsute; urgency=medium [ Marco Trevisan (Treviño) ] diff -Nru mutter-3.38.3/debian/patches/input-thread-backports/clutter-Use-G_PARAM_EXPLICIT_NOTIFY-for-actor-and-stage-p.patch mutter-3.38.3/debian/patches/input-thread-backports/clutter-Use-G_PARAM_EXPLICIT_NOTIFY-for-actor-and-stage-p.patch --- mutter-3.38.3/debian/patches/input-thread-backports/clutter-Use-G_PARAM_EXPLICIT_NOTIFY-for-actor-and-stage-p.patch 2021-03-10 11:48:22.000000000 +0800 +++ mutter-3.38.3/debian/patches/input-thread-backports/clutter-Use-G_PARAM_EXPLICIT_NOTIFY-for-actor-and-stage-p.patch 2021-03-18 15:06:36.000000000 +0800 @@ -28,11 +28,11 @@ clutter/clutter/clutter-stage.c | 9 ++- 2 files changed, 113 insertions(+), 43 deletions(-) -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index ff57017..0c09d5a 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -6072,6 +6072,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +Index: mutter/clutter/clutter/clutter-actor.c +=================================================================== +--- mutter.orig/clutter/clutter/clutter-actor.c ++++ mutter/clutter/clutter/clutter-actor.c +@@ -6072,6 +6072,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -40,7 +40,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6091,6 +6092,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6091,6 +6092,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -48,7 +48,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6113,6 +6115,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6113,6 +6115,7 @@ clutter_actor_class_init (ClutterActorCl GRAPHENE_TYPE_POINT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -56,7 +56,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6132,6 +6135,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6132,6 +6135,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -64,7 +64,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6151,6 +6155,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6151,6 +6155,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -72,7 +72,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6172,6 +6177,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6172,6 +6177,7 @@ clutter_actor_class_init (ClutterActorCl GRAPHENE_TYPE_SIZE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -80,7 +80,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6190,7 +6196,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6190,7 +6196,8 @@ clutter_actor_class_init (ClutterActorCl P_("Forced X position of the actor"), -G_MAXFLOAT, G_MAXFLOAT, 0.0, @@ -90,7 +90,7 @@ /** * ClutterActor:fixed-y: -@@ -6208,7 +6215,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6208,7 +6215,8 @@ clutter_actor_class_init (ClutterActorCl P_("Forced Y position of the actor"), -G_MAXFLOAT, G_MAXFLOAT, 0, @@ -100,7 +100,7 @@ /** * ClutterActor:fixed-position-set: -@@ -6223,7 +6231,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6223,7 +6231,8 @@ clutter_actor_class_init (ClutterActorCl P_("Fixed position set"), P_("Whether to use fixed positioning for the actor"), FALSE, @@ -110,7 +110,7 @@ /** * ClutterActor:min-width: -@@ -6243,7 +6252,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6243,7 +6252,8 @@ clutter_actor_class_init (ClutterActorCl P_("Forced minimum width request for the actor"), 0.0, G_MAXFLOAT, 0.0, @@ -120,7 +120,7 @@ /** * ClutterActor:min-height: -@@ -6262,7 +6272,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6262,7 +6272,8 @@ clutter_actor_class_init (ClutterActorCl P_("Forced minimum height request for the actor"), 0.0, G_MAXFLOAT, 0.0, @@ -130,7 +130,7 @@ /** * ClutterActor:natural-width: -@@ -6281,7 +6292,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6281,7 +6292,8 @@ clutter_actor_class_init (ClutterActorCl P_("Forced natural width request for the actor"), 0.0, G_MAXFLOAT, 0.0, @@ -140,7 +140,7 @@ /** * ClutterActor:natural-height: -@@ -6300,7 +6312,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6300,7 +6312,8 @@ clutter_actor_class_init (ClutterActorCl P_("Forced natural height request for the actor"), 0.0, G_MAXFLOAT, 0.0, @@ -150,7 +150,7 @@ /** * ClutterActor:min-width-set: -@@ -6315,7 +6328,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6315,7 +6328,8 @@ clutter_actor_class_init (ClutterActorCl P_("Minimum width set"), P_("Whether to use the min-width property"), FALSE, @@ -160,7 +160,7 @@ /** * ClutterActor:min-height-set: -@@ -6330,7 +6344,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6330,7 +6344,8 @@ clutter_actor_class_init (ClutterActorCl P_("Minimum height set"), P_("Whether to use the min-height property"), FALSE, @@ -170,7 +170,7 @@ /** * ClutterActor:natural-width-set: -@@ -6345,7 +6360,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6345,7 +6360,8 @@ clutter_actor_class_init (ClutterActorCl P_("Natural width set"), P_("Whether to use the natural-width property"), FALSE, @@ -180,7 +180,7 @@ /** * ClutterActor:natural-height-set: -@@ -6360,7 +6376,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6360,7 +6376,8 @@ clutter_actor_class_init (ClutterActorCl P_("Natural height set"), P_("Whether to use the natural-height property"), FALSE, @@ -190,7 +190,7 @@ /** * ClutterActor:allocation: -@@ -6379,6 +6396,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6379,6 +6396,7 @@ clutter_actor_class_init (ClutterActorCl CLUTTER_TYPE_ACTOR_BOX, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | @@ -198,7 +198,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6446,7 +6464,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6446,7 +6464,8 @@ clutter_actor_class_init (ClutterActorCl P_("The actor's request mode"), CLUTTER_TYPE_REQUEST_MODE, CLUTTER_REQUEST_HEIGHT_FOR_WIDTH, @@ -208,7 +208,7 @@ /** * ClutterActor:z-position: -@@ -6473,6 +6492,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6473,6 +6492,7 @@ clutter_actor_class_init (ClutterActorCl 0.0f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -216,15 +216,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6491,6 +6511,7 @@ clutter_actor_class_init (ClutterActorClass *klass) - 255, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS | -+ G_PARAM_EXPLICIT_NOTIFY | - CLUTTER_PARAM_ANIMATABLE); - - /** -@@ -6524,7 +6545,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6524,7 +6544,8 @@ clutter_actor_class_init (ClutterActorCl P_("Visible"), P_("Whether the actor is visible or not"), FALSE, @@ -234,7 +226,7 @@ /** * ClutterActor:mapped: -@@ -6539,7 +6561,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6539,7 +6560,8 @@ clutter_actor_class_init (ClutterActorCl P_("Mapped"), P_("Whether the actor will be painted"), FALSE, @@ -244,7 +236,7 @@ /** * ClutterActor:realized: -@@ -6553,7 +6576,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6553,7 +6575,8 @@ clutter_actor_class_init (ClutterActorCl P_("Realized"), P_("Whether the actor has been realized"), FALSE, @@ -254,7 +246,7 @@ /** * ClutterActor:reactive: -@@ -6569,7 +6593,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6569,7 +6592,8 @@ clutter_actor_class_init (ClutterActorCl P_("Reactive"), P_("Whether the actor is reactive to events"), FALSE, @@ -264,7 +256,7 @@ /** * ClutterActor:has-clip: -@@ -6581,7 +6606,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6581,7 +6605,8 @@ clutter_actor_class_init (ClutterActorCl P_("Has Clip"), P_("Whether the actor has a clip set"), FALSE, @@ -274,7 +266,7 @@ /** * ClutterActor:clip-rect: -@@ -6602,7 +6628,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6602,7 +6627,8 @@ clutter_actor_class_init (ClutterActorCl P_("The visible region of the actor"), GRAPHENE_TYPE_RECT, G_PARAM_READWRITE | @@ -284,7 +276,7 @@ /** * ClutterActor:name: -@@ -6616,7 +6643,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6616,7 +6642,8 @@ clutter_actor_class_init (ClutterActorCl P_("Name"), P_("Name of the actor"), NULL, @@ -294,7 +286,7 @@ /** * ClutterActor:pivot-point: -@@ -6640,6 +6668,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6640,6 +6667,7 @@ clutter_actor_class_init (ClutterActorCl GRAPHENE_TYPE_POINT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -302,7 +294,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6660,6 +6689,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6660,6 +6688,7 @@ clutter_actor_class_init (ClutterActorCl 0.f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -310,7 +302,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6679,6 +6709,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6679,6 +6708,7 @@ clutter_actor_class_init (ClutterActorCl 1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -318,7 +310,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6698,6 +6729,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6698,6 +6728,7 @@ clutter_actor_class_init (ClutterActorCl 1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -326,7 +318,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6717,6 +6749,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6717,6 +6748,7 @@ clutter_actor_class_init (ClutterActorCl 1.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -334,7 +326,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6736,6 +6769,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6736,6 +6768,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -342,7 +334,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6755,6 +6789,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6755,6 +6788,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -350,7 +342,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6794,6 +6829,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6794,6 +6828,7 @@ clutter_actor_class_init (ClutterActorCl 0.f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -358,7 +350,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6814,6 +6850,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6814,6 +6849,7 @@ clutter_actor_class_init (ClutterActorCl 0.f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -366,7 +358,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6834,6 +6871,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6834,6 +6870,7 @@ clutter_actor_class_init (ClutterActorCl 0.f, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -374,7 +366,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6864,6 +6902,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6864,6 +6901,7 @@ clutter_actor_class_init (ClutterActorCl CLUTTER_TYPE_MATRIX, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -382,7 +374,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6879,7 +6918,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6879,7 +6917,8 @@ clutter_actor_class_init (ClutterActorCl P_("Whether the transform property is set"), FALSE, G_PARAM_READABLE | @@ -392,7 +384,7 @@ /** * ClutterActor:child-transform: -@@ -6902,6 +6942,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6902,6 +6941,7 @@ clutter_actor_class_init (ClutterActorCl CLUTTER_TYPE_MATRIX, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -400,7 +392,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -6917,7 +6958,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6917,7 +6957,8 @@ clutter_actor_class_init (ClutterActorCl P_("Whether the child-transform property is set"), FALSE, G_PARAM_READABLE | @@ -410,7 +402,7 @@ /** * ClutterActor:show-on-set-parent: -@@ -6952,7 +6994,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6952,7 +6993,8 @@ clutter_actor_class_init (ClutterActorCl P_("Clip to Allocation"), P_("Sets the clip region to track the actor's allocation"), FALSE, @@ -420,7 +412,7 @@ /** * ClutterActor:text-direction: -@@ -6967,7 +7010,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6967,7 +7009,8 @@ clutter_actor_class_init (ClutterActorCl P_("Direction of the text"), CLUTTER_TYPE_TEXT_DIRECTION, CLUTTER_TEXT_DIRECTION_LTR, @@ -430,7 +422,7 @@ /** * ClutterActor:has-pointer: -@@ -6982,7 +7026,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6982,7 +7025,8 @@ clutter_actor_class_init (ClutterActorCl P_("Has Pointer"), P_("Whether the actor contains the pointer of an input device"), FALSE, @@ -440,7 +432,7 @@ /** * ClutterActor:actions: -@@ -6996,7 +7041,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -6996,7 +7040,8 @@ clutter_actor_class_init (ClutterActorCl P_("Actions"), P_("Adds an action to the actor"), CLUTTER_TYPE_ACTION, @@ -450,7 +442,7 @@ /** * ClutterActor:constraints: -@@ -7010,7 +7056,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7010,7 +7055,8 @@ clutter_actor_class_init (ClutterActorCl P_("Constraints"), P_("Adds a constraint to the actor"), CLUTTER_TYPE_CONSTRAINT, @@ -460,7 +452,7 @@ /** * ClutterActor:effect: -@@ -7024,7 +7071,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7024,7 +7070,8 @@ clutter_actor_class_init (ClutterActorCl P_("Effect"), P_("Add an effect to be applied on the actor"), CLUTTER_TYPE_EFFECT, @@ -470,7 +462,7 @@ /** * ClutterActor:layout-manager: -@@ -7039,7 +7087,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7039,7 +7086,8 @@ clutter_actor_class_init (ClutterActorCl P_("Layout Manager"), P_("The object controlling the layout of an actor's children"), CLUTTER_TYPE_LAYOUT_MANAGER, @@ -480,7 +472,7 @@ /** * ClutterActor:x-expand: -@@ -7055,7 +7104,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7055,7 +7103,8 @@ clutter_actor_class_init (ClutterActorCl P_("Whether extra horizontal space should be assigned to the actor"), FALSE, G_PARAM_READWRITE | @@ -490,7 +482,7 @@ /** * ClutterActor:y-expand: -@@ -7071,7 +7121,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7071,7 +7120,8 @@ clutter_actor_class_init (ClutterActorCl P_("Whether extra vertical space should be assigned to the actor"), FALSE, G_PARAM_READWRITE | @@ -500,7 +492,7 @@ /** * ClutterActor:x-align: -@@ -7088,7 +7139,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7088,7 +7138,8 @@ clutter_actor_class_init (ClutterActorCl P_("The alignment of the actor on the X axis within its allocation"), CLUTTER_TYPE_ACTOR_ALIGN, CLUTTER_ACTOR_ALIGN_FILL, @@ -510,7 +502,7 @@ /** * ClutterActor:y-align: -@@ -7104,7 +7156,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7104,7 +7155,8 @@ clutter_actor_class_init (ClutterActorCl P_("The alignment of the actor on the Y axis within its allocation"), CLUTTER_TYPE_ACTOR_ALIGN, CLUTTER_ACTOR_ALIGN_FILL, @@ -520,7 +512,7 @@ /** * ClutterActor:margin-top: -@@ -7126,6 +7179,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7126,6 +7178,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -528,7 +520,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -7148,6 +7202,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7148,6 +7201,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -536,7 +528,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -7170,6 +7225,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7170,6 +7224,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -544,7 +536,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -7192,6 +7248,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7192,6 +7247,7 @@ clutter_actor_class_init (ClutterActorCl 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -552,7 +544,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -7206,7 +7263,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7206,7 +7262,8 @@ clutter_actor_class_init (ClutterActorCl P_("Background Color Set"), P_("Whether the background color is set"), FALSE, @@ -562,7 +554,7 @@ /** * ClutterActor:background-color: -@@ -7225,6 +7283,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7225,6 +7282,7 @@ clutter_actor_class_init (ClutterActorCl CLUTTER_COLOR_Transparent, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | @@ -570,7 +562,7 @@ CLUTTER_PARAM_ANIMATABLE); /** -@@ -7239,7 +7298,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7239,7 +7297,8 @@ clutter_actor_class_init (ClutterActorCl P_("First Child"), P_("The actor's first child"), CLUTTER_TYPE_ACTOR, @@ -580,7 +572,7 @@ /** * ClutterActor:last-child: -@@ -7253,7 +7313,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7253,7 +7312,8 @@ clutter_actor_class_init (ClutterActorCl P_("Last Child"), P_("The actor's last child"), CLUTTER_TYPE_ACTOR, @@ -590,7 +582,7 @@ /** * ClutterActor:content: -@@ -7268,7 +7329,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7268,7 +7328,8 @@ clutter_actor_class_init (ClutterActorCl P_("Content"), P_("Delegate object for painting the actor's content"), CLUTTER_TYPE_CONTENT, @@ -600,7 +592,7 @@ /** * ClutterActor:content-gravity: -@@ -7295,7 +7357,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7295,7 +7356,8 @@ clutter_actor_class_init (ClutterActorCl P_("Alignment of the actor's content"), CLUTTER_TYPE_CONTENT_GRAVITY, CLUTTER_CONTENT_GRAVITY_RESIZE_FILL, @@ -610,7 +602,7 @@ /** * ClutterActor:content-box: -@@ -7317,6 +7380,7 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7317,6 +7379,7 @@ clutter_actor_class_init (ClutterActorCl CLUTTER_TYPE_ACTOR_BOX, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS | @@ -618,7 +610,7 @@ CLUTTER_PARAM_ANIMATABLE); obj_props[PROP_MINIFICATION_FILTER] = -@@ -7325,7 +7389,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7325,7 +7388,8 @@ clutter_actor_class_init (ClutterActorCl P_("The filter used when reducing the size of the content"), CLUTTER_TYPE_SCALING_FILTER, CLUTTER_SCALING_FILTER_LINEAR, @@ -628,7 +620,7 @@ obj_props[PROP_MAGNIFICATION_FILTER] = g_param_spec_enum ("magnification-filter", -@@ -7333,7 +7398,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7333,7 +7397,8 @@ clutter_actor_class_init (ClutterActorCl P_("The filter used when increasing the size of the content"), CLUTTER_TYPE_SCALING_FILTER, CLUTTER_SCALING_FILTER_LINEAR, @@ -638,7 +630,7 @@ /** * ClutterActor:content-repeat: -@@ -7349,7 +7415,8 @@ clutter_actor_class_init (ClutterActorClass *klass) +@@ -7349,7 +7414,8 @@ clutter_actor_class_init (ClutterActorCl CLUTTER_TYPE_CONTENT_REPEAT, CLUTTER_REPEAT_NONE, G_PARAM_READWRITE | @@ -648,11 +640,11 @@ g_object_class_install_properties (object_class, PROP_LAST, obj_props); -diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c -index 0444c0d..b825396 100644 ---- a/clutter/clutter/clutter-stage.c -+++ b/clutter/clutter/clutter-stage.c -@@ -1786,7 +1786,8 @@ clutter_stage_class_init (ClutterStageClass *klass) +Index: mutter/clutter/clutter/clutter-stage.c +=================================================================== +--- mutter.orig/clutter/clutter/clutter-stage.c ++++ mutter/clutter/clutter/clutter-stage.c +@@ -1786,7 +1786,8 @@ clutter_stage_class_init (ClutterStageCl P_("Perspective"), P_("Perspective projection parameters"), CLUTTER_TYPE_PERSPECTIVE, @@ -662,7 +654,7 @@ /** * ClutterStage:title: -@@ -1800,7 +1801,8 @@ clutter_stage_class_init (ClutterStageClass *klass) +@@ -1800,7 +1801,8 @@ clutter_stage_class_init (ClutterStageCl P_("Title"), P_("Stage Title"), NULL, @@ -672,7 +664,7 @@ /** * ClutterStage:key-focus: -@@ -1817,7 +1819,8 @@ clutter_stage_class_init (ClutterStageClass *klass) +@@ -1817,7 +1819,8 @@ clutter_stage_class_init (ClutterStageCl P_("Key Focus"), P_("The currently key focused actor"), CLUTTER_TYPE_ACTOR,