Accepting request 155440 from home:Zaitor:branches:GNOME:Factory

Update to 3.6.3 - however, we effectly already have this in 12.3 due to our patches, so no need to push for this. For factory it's fine

OBS-URL: https://build.opensuse.org/request/show/155440
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=111

mutter-3.6.2.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:924f47681c972c3e8da610608c6aef35e61f52b338b5690e5721ed7ef8c2befc
-size 1615792

mutter-3.6.3.tar.xz

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

mutter-correctly-create-new-pixmap.patch

@@ -1,26 +0,0 @@
-From 5ad3260bb8ef6f08e0c8426d42990e3bdcf52c52 Mon Sep 17 00:00:00 2001
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Sat, 02 Feb 2013 09:27:35 +0000
-Subject: meta-window-actor: Correctly create a new pixmap when redirecting a window again
-
-We should call meta_window_actor_detach not
-meta_window_actor_queue_create_pixmap to create a new pixmap when we redirect a
-previously unredirected window again.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=693042
----
-diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
-index 371233f..1490b9c 100644
---- a/src/compositor/meta-window-actor.c
-+++ b/src/compositor/meta-window-actor.c
-@@ -1237,7 +1237,7 @@ meta_window_actor_set_redirected (MetaWindowActor *self, gboolean state)
-       meta_error_trap_push (display);
-       XCompositeRedirectWindow (xdisplay, xwin, CompositeRedirectManual);
-       meta_error_trap_pop (display);
--      meta_window_actor_queue_create_pixmap (self);
-+      meta_window_actor_detach (self);
-       self->priv->unredirected = FALSE;
-     }
-   else
---
-cgit v0.9.0.2

mutter-stop-jumping-windows.patch

@@ -1,37 +0,0 @@
-From 0dee738a43e4fb4c3d5de5e3a55a4033faa9d3fa Mon Sep 17 00:00:00 2001
-From: Alban Crequy <alban.crequy@collabora.co.uk>
-Date: Fri, 23 Nov 2012 00:06:22 +0000
-Subject: Initialize window->user_rect in the initial placement
-
-The window positioning is delayed in idle_move_resize() in case the application
-resizes/maximizes its window quickly after its creation. The delayed
-positioning uses window->user_rect because of bug 426519 comment 3 (see
-meta_window_move_resize_now()).
-
-user_rect was not set in the initial positioning, causing the delayed
-positioning unable to know which monitor we use for this window. As a
-consequence, the window could jump spontaneously from one monitor to another.
-
-With this patch, the window does not jump anymore.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=556696
----
-diff --git a/src/core/constraints.c b/src/core/constraints.c
-index 2857f67..606baea 100644
---- a/src/core/constraints.c
-+++ b/src/core/constraints.c
-@@ -571,6 +571,11 @@ place_window_if_needed(MetaWindow     *window,
-                        .083 * info->work_area_monitor.height;
-             }
- 
-+          /* idle_move_resize() uses the user_rect, so make sure it uses the
-+           * placed coordinates (bug #556696).
-+           */
-+          window->user_rect = info->current;
-+
-           if (window->maximize_horizontally_after_placement ||
-               window->maximize_vertically_after_placement)
-             meta_window_maximize_internal (window,   
---
-cgit v0.9.0.2
-

mutter.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Feb 14 16:35:03 UTC 2013 - zaitor@opensuse.org
+
+- Update to version 3.6.3:
+  + Fix maximized windows jumping between monitors (bgo#556696).
+  + Fix windows turning black when redirected again (bgo #693042).
+  + Updated translations.
+- Drop mutter-stop-jumping-windows.patch and
+  mutter-correctly-create-new-pixmap.patch, fixed upstream.
+
 -------------------------------------------------------------------
 Fri Feb  8 22:04:46 UTC 2013 - badshah400@gmail.com
 

mutter.spec

@@ -17,17 +17,13 @@
 
 
 Name:           mutter
-Version:        3.6.2
+Version:        3.6.3
 Release:        0
 Summary:        Window and compositing manager based on Clutter
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/mutter/3.6/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM mutter-stop-jumping-windows.patch bgo#556696 zaitor@opensuse.org -- Stop windows from jumping spontaneously from one monitor to another.
-Patch0:         mutter-stop-jumping-windows.patch
-# PATCH-FIX-UPSTREAM mutter-correctly-create-new-pixmap.patch bgo#693042 badshah400@gmail.com -- Correctly create a new pixmap when redirecting a window again; patch taken from upstream git
-Patch1:         mutter-correctly-create-new-pixmap.patch
 BuildRequires:  fdupes
 BuildRequires:  gobject-introspection-devel >= 0.9.5
 BuildRequires:  intltool
@@ -126,8 +122,6 @@ to develop applications that require these.
 %lang_package
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 translation-update-upstream
 
 %if 0%{?BUILD_FROM_VCS}