r42714 - in /desktop/unstable/clutter-gtk/debian: changelog patches/git-revert-prefer-gdk.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Wed Sep 10 17:04:19 2014
New Revision: 42714

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42714
Log:
* Add debian/patches/git-revert-prefer-gdk.patch (Closes: #761009)
  - backported from upstream git.

Added:
    desktop/unstable/clutter-gtk/debian/patches/git-revert-prefer-gdk.patch
Modified:
    desktop/unstable/clutter-gtk/debian/changelog
    desktop/unstable/clutter-gtk/debian/patches/series

Modified: desktop/unstable/clutter-gtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-gtk/debian/changelog?rev=42714&op=diff
==============================================================================
--- desktop/unstable/clutter-gtk/debian/changelog	[utf-8] (original)
+++ desktop/unstable/clutter-gtk/debian/changelog	[utf-8] Wed Sep 10 17:04:19 2014
@@ -1,3 +1,10 @@
+clutter-gtk (1.5.4-2) unstable; urgency=medium
+
+  * Add debian/patches/git-revert-prefer-gdk.patch (Closes: #761009)
+    - backported from upstream git.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 10 Sep 2014 18:27:31 +0200
+
 clutter-gtk (1.5.4-1) unstable; urgency=medium
 
   * New upstream release.

Added: desktop/unstable/clutter-gtk/debian/patches/git-revert-prefer-gdk.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-gtk/debian/patches/git-revert-prefer-gdk.patch?rev=42714&op=file
==============================================================================
--- desktop/unstable/clutter-gtk/debian/patches/git-revert-prefer-gdk.patch	(added)
+++ desktop/unstable/clutter-gtk/debian/patches/git-revert-prefer-gdk.patch	[utf-8] Wed Sep 10 17:04:19 2014
@@ -0,0 +1,47 @@
+From a2a62570dd038a459326e3d56cb593af97e2f6f3 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Thu, 28 Aug 2014 15:44:44 +0100
+Subject: 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.
+
+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.
+-- 
+cgit v0.10.1
+

Modified: desktop/unstable/clutter-gtk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-gtk/debian/patches/series?rev=42714&op=diff
==============================================================================
--- desktop/unstable/clutter-gtk/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/clutter-gtk/debian/patches/series	[utf-8] Wed Sep 10 17:04:19 2014
@@ -0,0 +1 @@
+git-revert-prefer-gdk.patch