summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Piette <piette.simon@gmail.com>2012-09-09 15:39:00 -0400
committerSimon Piette <piette.simon@gmail.com>2012-09-09 15:39:00 -0400
commite02e0756a05fd24e22fb3b093cbb63b9fc89f9ce (patch)
tree1b23385eb4788d5ad1b5a0a5967ae981dafd5ed1
parent0d15d6950b1b94986be58916b8ba6d7f2da58113 (diff)
downloadmutter-e02e0756a05fd24e22fb3b093cbb63b9fc89f9ce.tar.gz
mutter-e02e0756a05fd24e22fb3b093cbb63b9fc89f9ce.tar.xz
mutter-e02e0756a05fd24e22fb3b093cbb63b9fc89f9ce.zip
Fix https://bugzilla.gnome.org/show_bug.cgi?id=675468 withf17
http://git.gnome.org/browse/mutter/commit/?id=e257580b
-rw-r--r--mutter-meta_stack_default_focus_window.patch24
-rw-r--r--mutter.spec10
2 files changed, 32 insertions, 2 deletions
diff --git a/mutter-meta_stack_default_focus_window.patch b/mutter-meta_stack_default_focus_window.patch
new file mode 100644
index 0000000..d857cc9
--- /dev/null
+++ b/mutter-meta_stack_default_focus_window.patch
@@ -0,0 +1,24 @@
+commit e257580b9484762064692b214114442243afa262
+Author: Jasper St. Pierre <jstpierre@mecheye.net>
+Date: Fri Jul 13 18:17:43 2012 -0400
+
+ workspace: Respect the not_this_one parameter passed in
+
+ In the case of focus-follows-mouse, we need to ensure that we
+ do not select a certain window after closing another one.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=675982
+
+diff --git a/src/core/workspace.c b/src/core/workspace.c
+index b710dd5..0ab52a6 100644
+--- a/src/core/workspace.c
++++ b/src/core/workspace.c
+@@ -1312,7 +1312,7 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace,
+
+ window = meta_stack_get_default_focus_window (workspace->screen->stack,
+ workspace,
+- NULL);
++ not_this_one);
+
+ if (window)
+ {
diff --git a/mutter.spec b/mutter.spec
index 0005df3..dcac0c8 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,6 +1,6 @@
Name: mutter
Version: 3.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Window and compositing manager based on Clutter
Group: User Interface/Desktops
@@ -10,6 +10,7 @@ Source0: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.
Patch0: mutter-never-slice-shape-mask.patch
Patch1: mutter-use-cogl-texrect-api.patch
+Patch2: mutter-meta_stack_default_focus_window.patch
BuildRequires: clutter-devel >= 1.7.5
BuildRequires: pango-devel
@@ -68,6 +69,7 @@ utilities for testing Metacity/Mutter themes.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -136,7 +138,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%doc %{_mandir}/man1/mutter-window-demo.1.gz
%changelog
-* Wed May 09 2012 Adam Jackson <ajax@redhat.com> 3.4.1-3
+* Sun Sep 09 2012 Simon Piette <simonp@fedorapeople.org> - 3.4.1-4
+- Fix https://bugzilla.gnome.org/show_bug.cgi?id=675468 with
+ http://git.gnome.org/browse/mutter/commit/?id=e257580b
+
+* Wed May 09 2012 Adam Jackson <ajax@redhat.com> - 3.4.1-3
- mutter-never-slice-shape-mask.patch, mutter-use-cogl-texrect-api.patch:
Fix window texturing on hardware without ARB_texture_non_power_of_two
(#813648)