summaryrefslogtreecommitdiff
path: root/extra/clutter-gtk
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-07-02 01:15:53 -0700
committerroot <root@rshg054.dnsready.net>2013-07-02 01:15:53 -0700
commit8917cf5e44af1562114fe0d243dcea7d187c8047 (patch)
tree198832346eded2df558ccf0fd078a52e8b6e904a /extra/clutter-gtk
parent545cc688f36387d9b1f29e04089a2d91a3786165 (diff)
Tue Jul 2 01:15:53 PDT 2013
Diffstat (limited to 'extra/clutter-gtk')
-rw-r--r--extra/clutter-gtk/PKGBUILD15
-rw-r--r--extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch29
2 files changed, 40 insertions, 4 deletions
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index d09988c74..6c4d74824 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $
+# $Id: PKGBUILD 189249 2013-07-01 11:24:00Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
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,8 +11,15 @@ options=('!libtool')
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
diff --git a/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
new file mode 100644
index 000000000..e3eb8ce13
--- /dev/null
+++ b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch
@@ -0,0 +1,29 @@
+From 6b1093d903f4605dcb974a3b299ed47f3e15edc1 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@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