[arch-commits] CVS update of extra/gnome/metacity (2 files)

[Jan de Groot]

    Date: Saturday, May 12, 2007 @ 11:47:39
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/metacity

   Added: metacity-2.18.2-session-crash.patch (1.1)
Modified: PKGBUILD (1.32 -> 1.33)

upgpkg: metacity 2.18.2-3
Fix crash of metacity when session is saved with applications open that do not support session management


-------------------------------------+
 PKGBUILD                            |    8 +++++---
 metacity-2.18.2-session-crash.patch |   22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)


Index: extra/gnome/metacity/PKGBUILD
diff -u extra/gnome/metacity/PKGBUILD:1.32 extra/gnome/metacity/PKGBUILD:1.33
--- extra/gnome/metacity/PKGBUILD:1.32	Sun Apr 22 11:10:54 2007
+++ extra/gnome/metacity/PKGBUILD	Sat May 12 11:47:38 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.32 2007/04/22 15:10:54 jgc Exp $
+# $Id: PKGBUILD,v 1.33 2007/05/12 15:47:38 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=metacity
 pkgver=2.18.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A window manager for GNOME2"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,11 +13,13 @@
 groups=('gnome')
 options=('nolibtool')
 install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.18/${pkgname}-${pkgver}.tar.bz2
+	metacity-2.18.2-session-crash.patch)
 md5sums=('45cdadd7d6213aeca3d9f1acc1d1d70f')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/metacity-2.18.2-session-crash.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/metacity \
               --localstatedir=/var --disable-static
Index: extra/gnome/metacity/metacity-2.18.2-session-crash.patch
diff -u /dev/null extra/gnome/metacity/metacity-2.18.2-session-crash.patch:1.1
--- /dev/null	Sat May 12 11:47:39 2007
+++ extra/gnome/metacity/metacity-2.18.2-session-crash.patch	Sat May 12 11:47:39 2007
@@ -0,0 +1,22 @@
+diff -Nur metacity-2.18.2/src/session.c metacity-2.18.2.new/src/session.c
+--- metacity-2.18.2/src/session.c	2007-04-08 20:46:17.000000000 +0200
++++ metacity-2.18.2.new/src/session.c	2007-04-26 00:18:24.000000000 +0200
+@@ -1824,8 +1824,6 @@
+ 
+       display_iter = display_iter->next;
+     }
+-  /* don't need to free displays */
+-  displays = NULL;
+ 
+   if (lame == NULL)
+     {
+@@ -1839,6 +1837,9 @@
+   timestamp = meta_display_get_current_time_roundtrip (displays->data);  
+   sprintf (timestampbuf, "%u", timestamp);
+ 
++  /* don't need to free displays */
++  displays = NULL;
++
+   len = g_slist_length (lame);
+   len *= 2; /* titles and also classes */
+   len += 2; /* --timestamp flag and actual timestamp */