Update to 3.23.3

0001-cogl-Do-not-include-both-GLES2-and-GL-headers.patch

@@ -1,38 +0,0 @@
-From 71077d582b4c8c36a2d0db47a3de70256545cd5a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Fri, 2 Dec 2016 14:07:08 +0100
-Subject: [PATCH] cogl: Do not include both GLES2 and GL headers
-
-EGLDevice requires a define from GLES2, even when GL is used instead.
-As type definitions may conflict between the two, we shouldn't include
-both at the same time. Instead, provide the missing define explicitly
-when not using GLES2.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=774891
----
- cogl/cogl/driver/gl/cogl-texture-2d-gl.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
-index d75a391..9a29c8f 100644
---- a/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
-+++ b/cogl/cogl/driver/gl/cogl-texture-2d-gl.c
-@@ -47,8 +47,13 @@
- #include "cogl-util-gl-private.h"
- 
- #if defined (COGL_HAS_EGL_SUPPORT)
--#include <GLES2/gl2.h>
--#include <GLES2/gl2ext.h>
-+#include "cogl-egl-defines.h"
-+#  ifndef COGL_HAS_GLES2
-+/* We need this define from GLES2, but can't include the header
-+   as its type definitions may conflict with the GL ones
-+ */
-+#  define GL_TEXTURE_EXTERNAL_OES           0x8D65
-+#  endif
- #endif
- 
- void
--- 
-2.9.3
-

mutter.spec

@@ -4,8 +4,8 @@
 %global libinput_version 1.4
 
 Name:          mutter
-Version:       3.23.2
-Release:       2%{?dist}
+Version:       3.23.3
+Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 License:       GPLv2+
@@ -20,7 +20,6 @@ Patch1:        startup-notification.patch
 # Fix format security issue that prevents compiling under Fedora
 #
 Patch2:        mutter-3.23.2-eglformat-security.patch
-Patch3:        0001-cogl-Do-not-include-both-GLES2-and-GL-headers.patch
 
 BuildRequires: chrpath
 BuildRequires: pango-devel
@@ -117,7 +116,6 @@ the functionality of the installed %{name} package.
 #patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 autoreconf -f -i
@@ -192,6 +190,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/mutter/tests
 
 %changelog
+* Thu Dec 15 2016 Florian Müllner <fmuellner@redhat.com> - 3.23.3-1
+- Update to 3.23.3
+
 * Fri Dec 02 2016 Florian Müllner <fmuellner@redhat.com> - 3.23.2-2
 - Fix build error on 32-bit platforms