rpms/at-spi/devel at-spi-1.18.0-deadlock.patch, NONE, 1.1 at-spi.spec, 1.65, 1.66

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/at-spi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24375

Modified Files:
	at-spi.spec 
Added Files:
	at-spi-1.18.0-deadlock.patch 
Log Message:
Fix application deadlocks


at-spi-1.18.0-deadlock.patch:
 bridge.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE at-spi-1.18.0-deadlock.patch ---
--- at-spi-1.18.0/atk-bridge/bridge.c.deadlock	2007-03-26 22:48:19.000000000 -0400
+++ at-spi-1.18.0/atk-bridge/bridge.c	2007-03-26 22:49:41.000000000 -0400
@@ -47,9 +47,9 @@
 #define DBG(a,b) if(_dbg>=(a))b
 
 #define bridge_threads_leave() \
-  if (!during_init_shutdown) atk_misc_threads_leave(misc)
+  if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_leave(misc)
 #define bridge_threads_enter() \
-  if (!during_init_shutdown) atk_misc_threads_enter(misc)
+  if (!during_init_shutdown && !g_main_context_is_owner (NULL)) atk_misc_threads_enter(misc)
 
 int _dbg = 0;
 static CORBA_Environment ev;


Index: at-spi.spec
===================================================================
RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- at-spi.spec	13 Mar 2007 15:33:42 -0000	1.65
+++ at-spi.spec	27 Mar 2007 02:55:38 -0000	1.66
@@ -8,9 +8,11 @@
 Summary: Assistive Technology Service Provider Interface 
 Name: at-spi
 Version: 1.18.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://developer.gnome.org/projects/gap/
 Source0: http://ftp.gnome.org/pub/gnome/sources/at-spi/1.18/%{name}-%{version}.tar.bz2
+# backport from upstream svn
+Patch0: at-spi-1.18.0-deadlock.patch
 
 License: LGPL
 Group: System Environment/Libraries
@@ -59,6 +61,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .deadlock
 
 %build
 %configure --disable-gtk-doc
@@ -98,6 +101,9 @@
 %{_includedir}/* 
 
 %changelog
+* Mon Mar 26 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.0-2
+- Backport a patch to fix deadlocks in applications
+
 * Tue Mar 13 2007 Matthias Clasen <mclasen at redhat.com> - 1.18.0-1
 - Update to 1.18.0
 - Drop obsolete patch