Accepting request 100971 from home:vuntz:branches:GNOME:Factory

Update to 3.3.4

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

mutter-3.3.3.tar.xz

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

mutter-3.3.4.tar.xz

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

mutter-fix-build-latest-gtk3.patch

@@ -1,36 +0,0 @@
-From e8209e7b221a4a108c132fa3a8ad27e9a8018a6d Mon Sep 17 00:00:00 2001
-From: Owen W. Taylor <otaylor@fishsoup.net>
-Date: Tue, 10 Jan 2012 00:03:07 +0000
-Subject: Handle rename of GTK+'s window-unfocused state to backdrop
-
-GTK_STATE_FLAG_WINDOW_UNFOCUSED was renamed to
-GTK_STATE_FLAG_BACKDROP.
----
-diff --git a/src/ui/theme.c b/src/ui/theme.c
-index 6e15d21..604505f 100644
---- a/src/ui/theme.c
-+++ b/src/ui/theme.c
-@@ -6403,8 +6403,8 @@ meta_gtk_state_from_string (const char *str)
-     return GTK_STATE_FLAG_INCONSISTENT;
-   else if (g_ascii_strcasecmp ("focused", str) == 0)
-     return GTK_STATE_FLAG_FOCUSED;
--  else if (g_ascii_strcasecmp ("window-unfocused", str) == 0)
--    return GTK_STATE_FLAG_WINDOW_UNFOCUSED;
-+  else if (g_ascii_strcasecmp ("backdrop", str) == 0)
-+    return GTK_STATE_FLAG_BACKDROP;
-   else
-     return -1; /* hack */
- }
-@@ -6428,8 +6428,8 @@ meta_gtk_state_to_string (GtkStateFlags state)
-       return "INCONSISTENT";
-     case GTK_STATE_FLAG_FOCUSED:
-       return "FOCUSED";
--    case GTK_STATE_FLAG_WINDOW_UNFOCUSED:
--      return "WINDOW_UNFOCUSED";
-+    case GTK_STATE_FLAG_BACKDROP:
-+      return "BACKDROP";
-     }
- 
-   return "<unknown>";
---
-cgit v0.9.0.2

mutter.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Jan 20 19:39:38 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.3.4:
+  + Adapt to changes in GtkStateFlags
+  + Redo properties for applications menu corresponding to GTK+
+    changes - they are now _GTK_* not DBUS_*.
+  + Fix crash on gnome-shell restart when a modal dialog is open
+    [bgo#668299]
+  + Code cleanup [bgo#666039]
+  + Updated translations.
+- Drop mutter-fix-build-latest-gtk3.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Wed Jan 18 11:28:48 UTC 2012 - vuntz@opensuse.org
 

mutter.spec

@@ -15,17 +15,14 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           mutter
-Version:        3.3.3
+Version:        3.3.4
 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.3/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM mutter-fix-build-latest-gtk3.patch vuntz@opensuse.org -- Fix build with gtk+ 3.3.8, taken from git
-Patch0:         mutter-fix-build-latest-gtk3.patch
 BuildRequires:  clutter-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-doc-utils-devel
@@ -67,7 +64,6 @@ to develop applications that require these.
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh