Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/soprano/files: soprano-2.4.0-socketMutex.unlock.patch
Date: Thu, 11 Feb 2010 12:47:57
Message-Id: E1NfYSY-000254-Fq@stork.gentoo.org
1 ssuominen 10/02/11 12:47:54
2
3 Added: soprano-2.4.0-socketMutex.unlock.patch
4 Log:
5 Apply upstream "unlock the mutex before deleting it" patch.
6 (Portage version: 2.2_rc62/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-libs/soprano/files/soprano-2.4.0-socketMutex.unlock.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/soprano/files/soprano-2.4.0-socketMutex.unlock.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/soprano/files/soprano-2.4.0-socketMutex.unlock.patch?rev=1.1&content-type=text/plain
13
14 Index: soprano-2.4.0-socketMutex.unlock.patch
15 ===================================================================
16 http://bugs.kde.org/show_bug.cgi?id=226218#c2
17 http://websvn.kde.org/?view=rev&revision=1088551
18
19 --- client/clientconnection.cpp
20 +++ client/clientconnection.cpp
21 @@ -71,12 +71,13 @@
22
23 Soprano::Client::ClientConnection::~ClientConnection()
24 {
25 - QMutexLocker lock( &d->socketMutex );
26 + d->socketMutex.lock();
27 // the sockets need to be deleted in their respective threads.
28 // this is what d->socketStorage does. We only close them here.
29 foreach( QIODevice* socket, d->sockets ) {
30 socket->close();
31 }
32 + d->socketMutex.unlock();
33 delete d;
34 }