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

[Jan Steffens]

    Date: Tuesday, May 24, 2011 @ 03:14:49
  Author: heftig
Revision: 124734

upgpkg: gnome-panel 3.0.2-1
Update to 3.0.2

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-24 07:12:17 UTC (rev 124733)
+++ PKGBUILD	2011-05-24 07:14:49 UTC (rev 124734)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.0.0.1
-pkgrel=3
+pkgver=3.0.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 pkgdesc="The GNOME Panel"
@@ -15,14 +15,11 @@
 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
-        fix-crasher-launchers.patch)
-sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b'
-            '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196')
 
 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 \

Deleted: fix-crasher-launchers.patch
===================================================================
--- fix-crasher-launchers.patch	2011-05-24 07:12:17 UTC (rev 124733)
+++ fix-crasher-launchers.patch	2011-05-24 07:14:49 UTC (rev 124734)
@@ -1,42 +0,0 @@
-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