[arch-commits] Commit in brasero/trunk (PKGBUILD fix_crasher.patch)

[Ionut Biru]

    Date: Friday, October 22, 2010 @ 12:38:25
  Author: ibiru
Revision: 96610

upgpkg: brasero 2.32.0-3
fix startup crasher

Added:
  brasero/trunk/fix_crasher.patch
Modified:
  brasero/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 ++++++---
 fix_crasher.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-22 15:15:38 UTC (rev 96609)
+++ PKGBUILD	2010-10-22 16:38:25 UTC (rev 96610)
@@ -5,7 +5,7 @@
 
 pkgname=brasero
 pkgver=2.32.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/brasero"
@@ -20,11 +20,14 @@
             'vcdimager: video project')
 replaces=('nautilus-cd-burner')
 install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/brasero/2.32/brasero-${pkgver}.tar.bz2)
-sha256sums=('72fbc36ace7a38f29499aff80ca426c5e30a04377417101ca047ca174af9ff97')
+source=(http://ftp.gnome.org/pub/gnome/sources/brasero/2.32/brasero-${pkgver}.tar.bz2
+        fix_crasher.patch)
+sha256sums=('72fbc36ace7a38f29499aff80ca426c5e30a04377417101ca047ca174af9ff97'
+            'eb186bb03320716e838a06aeb3e681c81646785e5671efce2a21ef3fae1ead7d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix_crasher.patch"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-caches \
       --disable-schemas-compile

Added: fix_crasher.patch
===================================================================
--- fix_crasher.patch	                        (rev 0)
+++ fix_crasher.patch	2010-10-22 16:38:25 UTC (rev 96610)
@@ -0,0 +1,47 @@
+From 3775cd7fc7d15aa03131a1d5cdccf57f185e2b92 Mon Sep 17 00:00:00 2001
+From: Luis Medinas <lmedinas at gnome.org>
+Date: Fri, 22 Oct 2010 11:30:58 +0000
+Subject: Fix crash for Bug 632576 - Brasero segfaults just before it should start
+
+burning
+---
+diff --git a/libbrasero-burn/burn-dbus.c b/libbrasero-burn/burn-dbus.c
+index 9292da3..fe5dea0 100644
+--- a/libbrasero-burn/burn-dbus.c
++++ b/libbrasero-burn/burn-dbus.c
+@@ -43,7 +43,7 @@
+ 
+ static GDBusConnection *conn;
+ 
+-void 
++void
+ brasero_uninhibit_suspend (guint cookie)
+ {
+ 	GError		*error = NULL;
+@@ -80,9 +80,11 @@ brasero_uninhibit_suspend (guint cookie)
+ 		g_warning ("Failed to restore the system power manager: %s",
+ 			    error->message);
+ 		g_error_free (error);
+-	}
++	} else {
++                g_variant_get (res, "(u)", &cookie);
++                g_variant_unref (res);
++        }
+ 
+-	g_variant_unref (res);
+ }
+ 
+ gint
+@@ -127,9 +129,8 @@ brasero_inhibit_suspend (const char *reason)
+ 	}
+ 	else {
+ 		g_variant_get (res, "(u)", &cookie);
++		g_variant_unref (res);
+ 	}
+ 
+-	g_variant_unref (res);
+-
+ 	return cookie;
+ }
+--
+cgit v0.8.3.1