[arch-commits] Commit in clutter-gtk/trunk (2 files)

[Jan de Groot]

    Date: Monday, July 1, 2013 @ 13:23:54
  Author: jgc
Revision: 189248

upgpkg: clutter-gtk 1.4.4-2

Fix FS#34969

Added:
  clutter-gtk/trunk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
Modified:
  clutter-gtk/trunk/PKGBUILD

-----------------------------------------------------------+
 PKGBUILD                                                  |   13 ++++-
 dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch |   29 ++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-01 10:57:37 UTC (rev 189247)
+++ PKGBUILD	2013-07-01 11:23:54 UTC (rev 189248)
@@ -3,7 +3,7 @@
 
 pkgname=clutter-gtk
 pkgver=1.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64')
 url="http://clutter-project.org/"
@@ -11,9 +11,16 @@
 license=('LGPL')
 depends=('clutter' 'gtk3')
 makedepends=('gobject-introspection')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch)
+sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e'
+            '45e86e364756d6ac86c646ee1bcab6c9b94316673963e0b83b1140d9c4978bef')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr

Added: dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
===================================================================
--- dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch	                        (rev 0)
+++ dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch	2013-07-01 11:23:54 UTC (rev 189248)
@@ -0,0 +1,29 @@
+From 6b1093d903f4605dcb974a3b299ed47f3e15edc1 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Wed, 27 Mar 2013 11:08:46 +0000
+Subject: util: Don't use clutter_x11_set_use_argb_visual() on non-X11
+
+We shouldn't be running this on non-X11 windowing systems.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696687
+---
+diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
+index 38e3ced..d4a9fa5 100644
+--- a/clutter-gtk/gtk-clutter-util.c
++++ b/clutter-gtk/gtk-clutter-util.c
+@@ -249,8 +249,11 @@ gtk_clutter_init_with_args (int            *argc,
+     return CLUTTER_INIT_SUCCESS;
+ 
+ #if defined(CLUTTER_WINDOWING_X11)
+-  /* enable ARGB visuals by default for Clutter */
+-  clutter_x11_set_use_argb_visual (TRUE);
++  if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
++    {
++      /* enable ARGB visuals by default for Clutter */
++      clutter_x11_set_use_argb_visual (TRUE);
++    }
+ #endif
+ 
+   /* we let gtk+ open the display */
+--
+cgit v0.9.2