[arch-commits] Commit in metacity/trunk (PKGBUILD fix_compositing_startup.patch)

[Jan de Groot]

    Date: Wednesday, September 12, 2012 @ 13:44:28
  Author: jgc
Revision: 166588

upgpkg: metacity 2.34.8-1

Update to 2.24.8, add patch for FS#31316: upstream knows about it, patch comes from Ubuntu

Added:
  metacity/trunk/fix_compositing_startup.patch
Modified:
  metacity/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   11 +++++++----
 fix_compositing_startup.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-12 17:38:22 UTC (rev 166587)
+++ PKGBUILD	2012-09-12 17:44:28 UTC (rev 166588)
@@ -2,22 +2,25 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=metacity
-pkgver=2.34.5
+pkgver=2.34.8
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra'  'libgtop' 'libsm' 'startup-notification' 'zenity')
-makedepends=('intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'yelp-tools')
 url="http://www.gnome.org"
 groups=('gnome')
 options=('!libtool' '!emptydirs')
 install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8e0712d4e3a4402b6b818348019dd864999585dda624a6ac0d44bf6a37ed2534')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        fix_compositing_startup.patch)
+sha256sums=('ab83038a9dc0b53a63b66c3f9323a10abb0b9a9ae2b5c5d3cc6bbabe2b607806'
+            '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i "${srcdir}/fix_compositing_startup.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/metacity \
       --localstatedir=/var --disable-static \

Added: fix_compositing_startup.patch
===================================================================
--- fix_compositing_startup.patch	                        (rev 0)
+++ fix_compositing_startup.patch	2012-09-12 17:44:28 UTC (rev 166588)
@@ -0,0 +1,12 @@
+diff -Naur metacity-2.34.5.orig/src/compositor/compositor-xrender.c metacity-2.34.5/src/compositor/compositor-xrender.c
+--- metacity-2.34.5.orig/src/compositor/compositor-xrender.c	2011-11-10 15:14:34.000000000 +0100
++++ metacity-2.34.5/src/compositor/compositor-xrender.c	2012-08-28 14:23:04.093750568 +0200
+@@ -3066,6 +3057,8 @@
+ #endif
+ 
+   xrc->enabled = TRUE;
++  xrc->show_redraw = FALSE;
++  xrc->debug = FALSE;
+   g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc);
+ 
+   return compositor;