From 7f1f02711256cd361ccf4db503f5c4095b4359fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 20 Aug 2014 02:39:17 +0200 Subject: [PATCH 1/6] Update to 3.13.90 --- .gitignore | 1 + mutter.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ce9ca40..1e8df8e 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ mutter-2.31.5.tar.bz2 /mutter-3.13.2.tar.xz /mutter-3.13.3.tar.xz /mutter-3.13.4.tar.xz +/mutter-3.13.90.tar.xz diff --git a/mutter.spec b/mutter.spec index 1af42a8..0eb7b91 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,8 +1,8 @@ -%global clutter_version 1.19.5 +%global clutter_version 1.19.7 Name: mutter -Version: 3.13.4 -Release: 3%{?dist} +Version: 3.13.90 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops @@ -26,8 +26,12 @@ BuildRequires: libXrandr-devel BuildRequires: libXrender-devel BuildRequires: libXcursor-devel BuildRequires: libXcomposite-devel +BuildRequires: libxcb-devel +BuildRequires: libxkbcommon-x11-devel +BuildRequires: libxkbfile-devel BuildRequires: pam-devel BuildRequires: upower-devel +BuildRequires: xkeyboard-config-devel BuildRequires: zenity BuildRequires: desktop-file-utils # Bootstrap requirements @@ -135,6 +139,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %exclude %{_datadir}/gtk-doc %changelog +* Wed Aug 20 2014 Florian Müllner - 3.13.90-1 +- Update to 3.13.90 + * Mon Aug 18 2014 Kalev Lember - 3.13.4-3 - Rebuilt for upower 0.99.1 soname bump diff --git a/sources b/sources index 5b20ddc..aa299c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -467d87daddd4a6b54b86702f1a4a02fc mutter-3.13.4.tar.xz +e143728a7fa33bdf6b2265914c838925 mutter-3.13.90.tar.xz From b1249fcaf8a678283849c6d599432dba0266529f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 20 Aug 2014 15:47:04 +0200 Subject: [PATCH 2/6] Depend on patched clutter clutter-1.19.6-3.fc21 has the new API backported that mutter needs. --- mutter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mutter.spec b/mutter.spec index 0eb7b91..5aee71d 100644 --- a/mutter.spec +++ b/mutter.spec @@ -1,4 +1,4 @@ -%global clutter_version 1.19.7 +%global clutter_version 1.19.6-3 Name: mutter Version: 3.13.90 From f8aff3304a66e3ba74a567459f5ee1ae0e9d0104 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 22 Aug 2014 15:20:49 -0600 Subject: [PATCH 3/6] Rebuild for new wayland --- mutter.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mutter.spec b/mutter.spec index 5aee71d..202582a 100644 --- a/mutter.spec +++ b/mutter.spec @@ -2,7 +2,7 @@ Name: mutter Version: 3.13.90 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops @@ -139,6 +139,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %exclude %{_datadir}/gtk-doc %changelog +* Fri Aug 22 2014 Kevin Fenzi 3.13.90-2 +- Rebuild for new wayland + * Wed Aug 20 2014 Florian Müllner - 3.13.90-1 - Update to 3.13.90 From f392c6b64f40f99d7019e3566e52ebabc91c92f1 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 25 Aug 2014 16:29:12 +0200 Subject: [PATCH 4/6] Add a patch from upstream fixing gnome-shell crashing non stop on multi monitor setups (rhbz#1103221) --- mutter.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mutter.spec b/mutter.spec index 202582a..d43f65f 100644 --- a/mutter.spec +++ b/mutter.spec @@ -2,7 +2,7 @@ Name: mutter Version: 3.13.90 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops @@ -10,6 +10,8 @@ License: GPLv2+ #VCS: git:git://git.gnome.org/mutter URL: http://www.gnome.org Source0: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz +# rhbz1103221 From upstream git, drop when rebasing +Patch1: 0001-workspace-Smarten-assert-in-light-of-O-R-windows.patch BuildRequires: clutter-devel >= %{clutter_version} BuildRequires: pango-devel @@ -75,6 +77,7 @@ utilities for testing Metacity/Mutter themes. %prep %setup -q +%patch1 -p1 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -139,6 +142,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %exclude %{_datadir}/gtk-doc %changelog +* Mon Aug 25 2014 Hans de Goede - 3.13.90-3 +- Add a patch from upstream fixing gnome-shell crashing non stop on + multi monitor setups (rhbz#1103221) + * Fri Aug 22 2014 Kevin Fenzi 3.13.90-2 - Rebuild for new wayland From 6f88355cb1c9d537441fc67ad267e2ec075a9f0b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 25 Aug 2014 16:36:58 +0200 Subject: [PATCH 5/6] Add missing patch --- ...arten-assert-in-light-of-O-R-windows.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 0001-workspace-Smarten-assert-in-light-of-O-R-windows.patch diff --git a/0001-workspace-Smarten-assert-in-light-of-O-R-windows.patch b/0001-workspace-Smarten-assert-in-light-of-O-R-windows.patch new file mode 100644 index 0000000..7eec8df --- /dev/null +++ b/0001-workspace-Smarten-assert-in-light-of-O-R-windows.patch @@ -0,0 +1,60 @@ +From 8f757c7b8062edc45e7d2c78508ed50969aa0be7 Mon Sep 17 00:00:00 2001 +From: "Jasper St. Pierre" +Date: Mon, 25 Aug 2014 08:57:13 -0400 +Subject: [PATCH 1/2] workspace: Smarten assert in light of O-R windows + +O-R windows appear in workspace->windows, which aren't relocatable, +so we can't simply check if the workspace is empty after relocating +all normal windows, since those windows remain. + +Make sure that the only windows we have are those that are +on_all_workspaces. +--- + src/core/workspace.c | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/core/workspace.c b/src/core/workspace.c +index af84eed..d55593c 100644 +--- a/src/core/workspace.c ++++ b/src/core/workspace.c +@@ -241,6 +241,19 @@ workspace_free_builtin_struts (MetaWorkspace *workspace) + workspace->builtin_struts = NULL; + } + ++/* Ensure that the workspace is empty by making sure that ++ * all of our windows are on-all-workspaces. */ ++static void ++assert_workspace_empty (MetaWorkspace *workspace) ++{ ++ GList *l; ++ for (l = workspace->windows; l != NULL; l = l->next) ++ { ++ MetaWindow *window = l->data; ++ g_assert (window->on_all_workspaces); ++ } ++} ++ + void + meta_workspace_remove (MetaWorkspace *workspace) + { +@@ -249,7 +262,7 @@ meta_workspace_remove (MetaWorkspace *workspace) + + g_return_if_fail (workspace != workspace->screen->active_workspace); + +- g_assert (workspace->windows == NULL); ++ assert_workspace_empty (workspace); + + screen = workspace->screen; + +@@ -349,7 +362,7 @@ meta_workspace_relocate_windows (MetaWorkspace *workspace, + + g_list_free (copy); + +- g_assert (workspace->windows == NULL); ++ assert_workspace_empty (workspace); + } + + void +-- +2.1.0 + From 64e61654acf9a40977a05b91b238aa6d1b954383 Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Tue, 26 Aug 2014 19:02:06 +0200 Subject: [PATCH 6/6] Backport fix for RH #1133166 --- ...or-Fix-is_argb32-for-unredirected-wi.patch | 43 +++++++++++++++++++ mutter.spec | 7 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-meta-surface-actor-Fix-is_argb32-for-unredirected-wi.patch diff --git a/0001-meta-surface-actor-Fix-is_argb32-for-unredirected-wi.patch b/0001-meta-surface-actor-Fix-is_argb32-for-unredirected-wi.patch new file mode 100644 index 0000000..4446d32 --- /dev/null +++ b/0001-meta-surface-actor-Fix-is_argb32-for-unredirected-wi.patch @@ -0,0 +1,43 @@ +From d15bce3e4aff06e4a70f156f41eec73f4089cd16 Mon Sep 17 00:00:00 2001 +From: Adel Gadllah +Date: Tue, 26 Aug 2014 18:22:33 +0200 +Subject: [PATCH] meta-surface-actor: Fix is_argb32 for unredirected windows + +meta_surface_actor_is_argb32 assumes that lack of stex means that a window is +ARGB32. When we unredirect a window we detach the texture so we end up without +a texture. Given that should_unredirect returns FALSE when a window is argb32, +we know that this window is indeed not ARGB32. + +Returing TRUE in that case causes us to flip between redirected and +unredirected on every paint. + +So fix that by returning FALSE in that case. +--- + src/compositor/meta-surface-actor.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/compositor/meta-surface-actor.c b/src/compositor/meta-surface-actor.c +index e7e3a02..bb85478 100644 +--- a/src/compositor/meta-surface-actor.c ++++ b/src/compositor/meta-surface-actor.c +@@ -280,9 +280,15 @@ meta_surface_actor_is_argb32 (MetaSurfaceActor *self) + CoglTexture *texture = meta_shaped_texture_get_texture (stex); + + /* If we don't have a texture, like during initialization, assume +- * that we're ARGB32. */ ++ * that we're ARGB32. ++ * ++ * If we are unredirected and we have no texture assume that we are ++ * not ARGB32 otherwise we wouldn't be unredirected in the first ++ * place. This prevents us from continually redirecting and ++ * unredirecting on every paint. ++ */ + if (!texture) +- return TRUE; ++ return !meta_surface_actor_is_unredirected (self); + + switch (cogl_texture_get_components (texture)) + { +-- +1.9.3 + diff --git a/mutter.spec b/mutter.spec index d43f65f..4fcfd8f 100644 --- a/mutter.spec +++ b/mutter.spec @@ -2,7 +2,7 @@ Name: mutter Version: 3.13.90 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Window and compositing manager based on Clutter Group: User Interface/Desktops @@ -12,6 +12,7 @@ URL: http://www.gnome.org Source0: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz # rhbz1103221 From upstream git, drop when rebasing Patch1: 0001-workspace-Smarten-assert-in-light-of-O-R-windows.patch +Patch2: 0001-meta-surface-actor-Fix-is_argb32-for-unredirected-wi.patch BuildRequires: clutter-devel >= %{clutter_version} BuildRequires: pango-devel @@ -78,6 +79,7 @@ utilities for testing Metacity/Mutter themes. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; @@ -142,6 +144,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %exclude %{_datadir}/gtk-doc %changelog +* Tue Aug 26 2014 Adel Gadllah - 3.13.90-4 +- Apply fix for RH #1133166 + * Mon Aug 25 2014 Hans de Goede - 3.13.90-3 - Add a patch from upstream fixing gnome-shell crashing non stop on multi monitor setups (rhbz#1103221)