Accepting request 1042339 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/1042339
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutter?expand=0&rev=193
This commit is contained in:
Dominique Leuenberger 2022-12-13 17:54:46 +00:00 committed by Git OBS Bridge
commit 2790161a89
7 changed files with 25 additions and 64 deletions

View File

@ -3,7 +3,7 @@
<service name="obs_scm" mode="manual"> <service name="obs_scm" mode="manual">
<param name="scm">git</param> <param name="scm">git</param>
<param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param> <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
<param name="revision">refs/tags/43.1</param> <param name="revision">refs/tags/43.2</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param> <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
<param name="versionrewrite-pattern">(.*)\+0</param> <param name="versionrewrite-pattern">(.*)\+0</param>
<param name="versionrewrite-replacement">\1</param> <param name="versionrewrite-replacement">\1</param>

View File

@ -1,53 +0,0 @@
From cc7752fc65db0d1c1d70def406f81c9733cce6a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Dre=C3=9Fler?= <verdre@v0yd.nl>
Date: Mon, 14 Nov 2022 00:14:05 +0100
Subject: [PATCH] clutter/actor: Show on all stage-views when actors have no
allocation
When a badly behaving ClutterActor implementation manages to invalidate
the allocation after the layout phase and before painting, we have no
idea where the actor should be painted without running the whole layout
machinery again.
For paint volumes in this case we pretend the actor covers the whole
stage and queue full-stage redraws. When updating stage-views, we're
also handling this case, but not in the most graceful way. Just like
with paint volumes, we should assume an actor without a valid allocation
is simply everywhere, so set priv->stage_views to all available stage
views in that case.
Related: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6054
---
clutter/clutter/clutter-actor.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index 95cfa65..dd96858 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -15459,18 +15459,19 @@ update_stage_views (ClutterActor *self)
ClutterStage *stage;
graphene_rect_t bounding_rect;
+ stage = CLUTTER_STAGE (_clutter_actor_get_stage_internal (self));
+ g_return_if_fail (stage);
+
old_stage_views = g_steal_pointer (&priv->stage_views);
if (priv->needs_allocation)
{
g_warning ("Can't update stage views actor %s is on because it needs an "
"allocation.", _clutter_actor_get_debug_name (self));
+ priv->stage_views = g_list_copy (clutter_stage_peek_stage_views (stage));
goto out;
}
- stage = CLUTTER_STAGE (_clutter_actor_get_stage_internal (self));
- g_return_if_fail (stage);
-
clutter_actor_get_transformed_extents (self, &bounding_rect);
if (bounding_rect.size.width == 0.0 ||
--
2.38.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03127c3e91a1c5e1188b6472581f70fe0a2d7b7961a0a9e54f3c65a6dd9f5cc5
size 25299469

3
mutter-43.2.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7729656281f1202fde9060434374d8fd44e5fb8d57568ee49fe1b8f979347b4c
size 25321485

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Sat Dec 10 08:41:31 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 43.2:
+ Fix edge resistance and window snapping regression.
+ Handle stage view updates without allocation more gracefully.
+ Fix window screenshots being cut off at the bottom right.
+ Implement wl_output v3 and v4.
+ Fix recalculating viewport after window resize.
+ Set LOD bias for sharper mipmaps.
+ Don't disable KMS modifiers on newer i915 systems.
+ Fixed crashes.
+ Misc. bug fixes and cleanups.
+ Updated translations.
- Drop clutter-actor-Show-on-all-stage-views-when-actors-ha.patch:
Fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 24 11:26:23 UTC 2022 - Martin Wilck <mwilck@suse.com> Thu Nov 24 11:26:23 UTC 2022 - Martin Wilck <mwilck@suse.com>

View File

@ -1,4 +1,4 @@
name: mutter name: mutter
version: 43.1 version: 43.2
mtime: 1667488776 mtime: 1670279105
commit: 8329a3eb5f4960df919e0348bd445c40568d3d60 commit: 46f4143619734ec2b95503ba96e444f61f27e18e

View File

@ -22,7 +22,7 @@
%define api_minor 0 %define api_minor 0
%define libmutter libmutter-%{api_major}-%{api_minor} %define libmutter libmutter-%{api_major}-%{api_minor}
Name: mutter Name: mutter
Version: 43.1 Version: 43.2
Release: 0 Release: 0
Summary: Window and compositing manager based on Clutter Summary: Window and compositing manager based on Clutter
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -40,8 +40,6 @@ Patch1: mutter-disable-cvt-s390x.patch
Patch2: mutter-window-actor-Special-case-shaped-Java-windows.patch Patch2: mutter-window-actor-Special-case-shaped-Java-windows.patch
# PATCH-FIX-UPSTREAM mutter-crash-meta_context_terminate.patch bsc#1199382 glgo#GNOME/mutter#2267 xwang@suse.com -- Fix SIGSEGV in meta_context_terminate # PATCH-FIX-UPSTREAM mutter-crash-meta_context_terminate.patch bsc#1199382 glgo#GNOME/mutter#2267 xwang@suse.com -- Fix SIGSEGV in meta_context_terminate
Patch3: mutter-crash-meta_context_terminate.patch Patch3: mutter-crash-meta_context_terminate.patch
# PATCH-FIX-UPSTREAM clutter-actor-Show-on-all-stage-views-when-actors-ha.patch boo#1205714 glgo#GNOME/mutter!2694 glgo#GNOME/gnome-shell#6054
Patch4: clutter-actor-Show-on-all-stage-views-when-actors-ha.patch
## SLE-only patches start at 1000 ## SLE-only patches start at 1000
# PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box. # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
@ -150,7 +148,6 @@ applications that want to make use of the mutter library.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# SLE-only patches and translations. # SLE-only patches and translations.
%if 0%{?sle_version} %if 0%{?sle_version}