[arch-commits] Commit in gnome-panel/trunk (PKGBUILD fix-crasher-launchers.patch)

[Ionut Biru]

    Date: Monday, April 11, 2011 @ 16:09:24
  Author: ibiru
Revision: 119512

upgpkg: gnome-panel 3.0.0.1-3
fix crasher. FS#23699

Added:
  gnome-panel/trunk/fix-crasher-launchers.patch
Modified:
  gnome-panel/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   10 ++++++----
 fix-crasher-launchers.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-11 20:08:40 UTC (rev 119511)
+++ PKGBUILD	2011-04-11 20:09:24 UTC (rev 119512)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-panel
 pkgver=3.0.0.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="The GNOME Panel"
@@ -14,13 +14,15 @@
 groups=('gnome')
 replaces=('gnome-panel-bonobo')
 provides=("gnome-panel-bonobo=${pkgver}")
-
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2
+        fix-crasher-launchers.patch)
+sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b'
+            '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch"
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-panel \

Added: fix-crasher-launchers.patch
===================================================================
--- fix-crasher-launchers.patch	                        (rev 0)
+++ fix-crasher-launchers.patch	2011-04-11 20:09:24 UTC (rev 119512)
@@ -0,0 +1,42 @@
+From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <joss at malsain.org>
+Date: Mon, 11 Apr 2011 13:05:32 +0000
+Subject: panel: Fix crash when starting launcher
+
+Do not destroy a widget in its draw signal. This is bad. Really.
+
+This was happening in the animation that is being drawn after clicking a
+launcher.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=641325
+---
+diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
+index 8465341..5acbf66 100644
+--- a/gnome-panel/xstuff.c
++++ b/gnome-panel/xstuff.c
+@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window)
+ }
+ 
+ static gboolean
++idle_destroy (gpointer data)
++{
++	gtk_widget_destroy (GTK_WIDGET (data));
++
++	return FALSE;
++}
++
++static gboolean
+ zoom_draw (GtkWidget *widget,
+ 	   cairo_t   *cr,
+            gpointer    user_data)
+@@ -323,7 +331,7 @@ zoom_draw (GtkWidget *widget,
+ 
+ 		g_slice_free (CompositedZoomData, zoom);
+ 
+-		gtk_widget_destroy (widget);
++		g_idle_add (idle_destroy, widget);
+ 	} else {
+ 		GdkPixbuf *scaled;
+ 		int width, height;
+--
+cgit v0.9