packages: brasero/brasero.spec, brasero/brasero-inhibit.patch (NEW) - add b...

[atler]

Author: atler                        Date: Mon Nov 15 12:28:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add brasero-inhibit.patch from git
- rel 2

---- Files affected:
packages/brasero:
   brasero.spec (1.63 -> 1.64) , brasero-inhibit.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/brasero/brasero.spec
diff -u packages/brasero/brasero.spec:1.63 packages/brasero/brasero.spec:1.64
--- packages/brasero/brasero.spec:1.63	Fri Oct  1 23:06:09 2010
+++ packages/brasero/brasero.spec	Mon Nov 15 13:28:35 2010
@@ -7,11 +7,12 @@
 Summary(pl.UTF-8):	Program do wypalania płyt dla GNOME
 Name:		brasero
 Version:	2.32.0
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/brasero/2.32/%{name}-%{version}.tar.bz2
 # Source0-md5:	09aaa188f33caa0bcc71a7dfc4a3f9ad
+Patch0:		%{name}-inhibit.patch
 URL:		http://www.gnome.org/projects/brasero/
 BuildRequires:	GConf2-devel >= 2.32.0
 BuildRequires:	autoconf
@@ -117,6 +118,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i s#^en at shaw## po/LINGUAS
 rm po/en at shaw.po
 
@@ -225,6 +227,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2010/11/15 12:28:35  atler
+- add brasero-inhibit.patch from git
+- rel 2
+
 Revision 1.63  2010/10/01 21:06:09  megabajt
 - updated to 2.32.0 (new soname)
 

================================================================
Index: packages/brasero/brasero-inhibit.patch
diff -u /dev/null packages/brasero/brasero-inhibit.patch:1.1
--- /dev/null	Mon Nov 15 13:28:41 2010
+++ packages/brasero/brasero-inhibit.patch	Mon Nov 15 13:28:35 2010
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/brasero/brasero.spec?r1=1.63&r2=1.64&f=u