[packages/gamin] add double-lock patch from fedora

glen glen at pld-linux.org
Thu Feb 21 09:47:49 CET 2013


commit 438b1545e15f09cb6255887cee277c69b4ded48e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Feb 21 10:35:18 2013 +0200

    add double-lock patch from fedora

 double-lock.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 gamin.spec        |  4 +++-
 2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/gamin.spec b/gamin.spec
index e7f1b78..91ef440 100644
--- a/gamin.spec
+++ b/gamin.spec
@@ -2,12 +2,13 @@ Summary:	Library providing the gamin File Alteration Monitor API
 Summary(pl.UTF-8):	Biblioteka dostarczająca File Alteration Monitor API gamina
 Name:		gamin
 Version:	0.1.10
-Release:	4
+Release:	5
 License:	LGPL v2.1
 Group:		Libraries
 Source0:	http://www.gnome.org/~veillard/gamin/sources/%{name}-%{version}.tar.gz
 # Source0-md5:	b4ec549e57da470c04edd5ec2876a028
 Patch0:		%{name}-glib.patch
+Patch1:		double-lock.patch
 URL:		http://www.gnome.org/~veillard/gamin/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -94,6 +95,7 @@ Moduły języka Python dla gamina.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/double-lock.patch b/double-lock.patch
new file mode 100644
index 0000000..9a309c6
--- /dev/null
+++ b/double-lock.patch
@@ -0,0 +1,40 @@
+gam_server deadlocks, leading to all KDE applications hanging at start
+https://bugzilla.redhat.com/show_bug.cgi?id=786170
+
+Also happens to lock courier-imapd processes in pld linux
+
+From 50df2c4de7b3aa8bed8781c92afb9a635a01df3f Mon Sep 17 00:00:00 2001
+From: Sandro Mani <manisandro at gmail.com>
+Date: Fri, 3 Feb 2012 09:10:21 +0100
+Subject: [PATCH] Fix double lock
+
+https://bugzilla.gnome.org/show_bug.cgi?id=669292
+---
+ server/inotify-helper.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/server/inotify-helper.c b/server/inotify-helper.c
+index d77203e..defa7c6 100644
+--- a/server/inotify-helper.c
++++ b/server/inotify-helper.c
+@@ -127,9 +127,6 @@ ih_sub_add (ih_sub_t * sub)
+ gboolean
+ ih_sub_cancel (ih_sub_t * sub)
+ {
+-	G_LOCK(inotify_lock);
+-
+-
+ 	if (!sub->cancelled)
+ 	{
+ 		IH_W("cancelling %s\n", sub->pathname);
+@@ -140,7 +137,6 @@ ih_sub_cancel (ih_sub_t * sub)
+ 		sub_list = g_list_remove (sub_list, sub);
+ 	}
+ 
+-	G_UNLOCK(inotify_lock);
+ 	return TRUE;
+ }
+ 
+-- 
+1.7.9
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gamin.git/commitdiff/9c3eb84c62f36b78fe438be428d78774f90e66a5



More information about the pld-cvs-commit mailing list