From cbf710af21ddcb5f26487d7c3ee79374ab673cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 19 Aug 2016 22:48:44 +0200
Subject: [PATCH] Update to 3.21.90

---
 .gitignore                                    |  1 +
 ...2-Don-t-leak-gles2-types-into-mutter.patch | 29 -------------------
 mutter.spec                                   |  8 ++---
 sources                                       |  2 +-
 4 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch

diff --git a/.gitignore b/.gitignore
index 34dfcd3..f05798a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@ mutter-2.31.5.tar.bz2
 /mutter-3.21.2.tar.xz
 /mutter-3.21.3.tar.xz
 /mutter-3.21.4.tar.xz
+/mutter-3.21.90.tar.xz
diff --git a/0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch b/0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch
deleted file mode 100644
index f17b3d5..0000000
--- a/0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 991f2d696af5fcac3a419ae64623e9703ea4bb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Wed, 20 Jul 2016 23:46:23 +0200
-Subject: [PATCH] cogl-gles2: Don't leak gles2 types into mutter
-
-On i686, the GLsizeiptr typedef in cogl-gles2.h conflicts with the
-system GL headers, so make sure we don't include both.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=769014
----
- cogl/cogl/cogl-gles2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cogl/cogl/cogl-gles2.h b/cogl/cogl/cogl-gles2.h
-index a90d0ce..87a06f1 100644
---- a/cogl/cogl/cogl-gles2.h
-+++ b/cogl/cogl/cogl-gles2.h
-@@ -65,7 +65,7 @@
-  * conflicts we only expose the minimal set of GLES 2.0 types and enums
-  * publicly.
-  */
--#ifdef COGL_COMPILATION
-+#if defined(COGL_COMPILATION) || defined(COGL_ENABLE_MUTTER_API)
- #include "cogl-gl-header.h"
- #else
- #include <cogl/cogl-gles2-types.h>
--- 
-2.7.4
-
diff --git a/mutter.spec b/mutter.spec
index adc93db..99e0c9f 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -4,7 +4,7 @@
 %global libinput_version 0.8
 
 Name:          mutter
-Version:       3.21.4
+Version:       3.21.90
 Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
@@ -14,8 +14,6 @@ License:       GPLv2+
 URL:           http://www.gnome.org
 Source0:       http://download.gnome.org/sources/%{name}/3.21/%{name}-%{version}.tar.xz
 
-Patch0:        0001-cogl-gles2-Don-t-leak-gles2-types-into-mutter.patch
-
 BuildRequires: chrpath
 BuildRequires: pango-devel
 BuildRequires: startup-notification-devel
@@ -108,7 +106,6 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-type-error-on-i686
 
 %build
 autoreconf -f -i
@@ -183,6 +180,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/mutter/tests
 
 %changelog
+* Fri Aug 19 2016 Florian Müllner <fmuellner@redhat.com> - 3.21.90-1
+- Update to 3.21.90
+
 * Wed Jul 20 2016 Florian Müllner <fmuellner@redhat.com> - 3.21.4-1
 - Update to 3.21.4
 - Drop downstream patch
diff --git a/sources b/sources
index f95e9a1..77b08e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6ee4a803dd8985b3912e8e77313aee8  mutter-3.21.4.tar.xz
+806df30cfad4f04930f40fb3b43aa7fa  mutter-3.21.90.tar.xz