From 9b449b36abff0f2761bbc5172290c793d62c5b28 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Sun, 7 Sep 2014 22:38:03 +0200
Subject: [PATCH] Revert "Prefer the GDK windowing backend for Clutter"

Backport an upstream patch that reverts the switch to the clutter GDK
windowing backend.

https://bugzilla.redhat.com/show_bug.cgi?id=1134921
https://bugzilla.redhat.com/show_bug.cgi?id=1139052
---
 ...he-GDK-windowing-backend-for-Clutter.patch | 50 +++++++++++++++++++
 clutter-gtk.spec                              |  8 ++-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch

diff --git a/0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch b/0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch
new file mode 100644
index 0000000..bb44b96
--- /dev/null
+++ b/0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch
@@ -0,0 +1,50 @@
+From a2a62570dd038a459326e3d56cb593af97e2f6f3 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Thu, 28 Aug 2014 15:44:44 +0100
+Subject: [PATCH] Revert "Prefer the GDK windowing backend for Clutter"
+
+This reverts commit 0fc73a07770223964dbf41a20a4b0a8c3ef9a29c.
+
+I could have gotten away with this, if it wasn't for you meddling kids
+and your Wayland.
+---
+ clutter-gtk/gtk-clutter-util.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
+index 53ec095..f66f8a9 100644
+--- a/clutter-gtk/gtk-clutter-util.c
++++ b/clutter-gtk/gtk-clutter-util.c
+@@ -66,9 +66,6 @@ gtk_clutter_init_internal (void)
+   display = gdk_display_get_default ();
+ 
+ #if defined(CLUTTER_WINDOWING_GDK)
+-  /* we want the GDK backend by default */
+-  clutter_set_windowing_backend (CLUTTER_WINDOWING_GDK);
+-
+   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_GDK))
+     {
+       clutter_gdk_set_display (gdk_display_get_default ());
+@@ -82,7 +79,7 @@ gtk_clutter_init_internal (void)
+   if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11) &&
+       GDK_IS_X11_DISPLAY (display))
+     {
+-      /* enable ARGB visuals by default for Clutter; this is a no-op */
++      /* enable ARGB visuals by default for Clutter */
+       clutter_x11_set_use_argb_visual (TRUE);
+ 
+       /* share the X11 Display with GTK+ */
+@@ -113,9 +110,7 @@ gtk_clutter_init_internal (void)
+     }
+   else
+ #endif
+-    {
+-      g_error ("*** Unsupported backend.");
+-    }
++    g_error ("*** Unsupported backend.");
+ 
+   /* We disable clutter accessibility support in order to not
+    * interfere with gtk accessibility support.
+-- 
+2.1.0
+
diff --git a/clutter-gtk.spec b/clutter-gtk.spec
index 758cdee..ff10aed 100644
--- a/clutter-gtk.spec
+++ b/clutter-gtk.spec
@@ -2,7 +2,7 @@
 
 Name:           clutter-gtk
 Version:        1.5.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A basic GTK clutter widget
 
 Group:          Development/Languages
@@ -10,6 +10,8 @@ License:        LGPLv2+
 URL:            http://www.clutter-project.org
 Source0:        http://download.gnome.org/sources/clutter-gtk/1.5/clutter-gtk-%{version}.tar.xz
 
+Patch0:         0001-Revert-Prefer-the-GDK-windowing-backend-for-Clutter.patch
+
 BuildRequires:  gtk3-devel >= 3.0.0
 BuildRequires:  clutter-devel >= 1.9
 BuildRequires:  gobject-introspection-devel
@@ -31,6 +33,7 @@ clutter-gtk.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -66,6 +69,9 @@ make check %{?_smp_mflags} V=1
 %{_datadir}/gtk-doc/html/clutter-gtk-1.0
 
 %changelog
+* Sun Sep 07 2014 Kalev Lember <kalevlember@gmail.com> - 1.5.4-2
+- Revert "Prefer the GDK windowing backend for Clutter" (#1134921, #1139052)
+
 * Thu Aug 21 2014 Kalev Lember <kalevlember@gmail.com> - 1.5.4-1
 - Update to 1.5.4
 - Drop duplicate deps that rpmbuild autogenerates