[libktorrent] KTorrent freezes on start (#808178)

[Rex Dieter]

commit cbcfbbafe0c148bca829546687772dee5a75add2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 29 13:58:52 2012 -0500

    KTorrent freezes on start (#808178)

 libktorrent-1.2.0-webseed_deadlock.patch |   20 ++++++++++++++++++++
 libktorrent.spec                         |   16 +++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/libktorrent-1.2.0-webseed_deadlock.patch b/libktorrent-1.2.0-webseed_deadlock.patch
new file mode 100644
index 0000000..260cc76
--- /dev/null
+++ b/libktorrent-1.2.0-webseed_deadlock.patch
@@ -0,0 +1,20 @@
+commit 1ea7a2e39aac91080d36bfc4898af3737270a122
+Author: Joris Guisson <joris.guisson at gmail.com>
+Date:   Sun Mar 11 17:44:37 2012 +0100
+
+    Backport to 1.2: Fix deadlock in webseed code
+    
+    CCBUG: 295719
+
+diff --git a/src/download/httpconnection.cpp b/src/download/httpconnection.cpp
+index f154ad1..34067c4 100644
+--- a/src/download/httpconnection.cpp
++++ b/src/download/httpconnection.cpp
+@@ -308,7 +308,6 @@ namespace bt
+ 	
+ 	float HttpConnection::getDownloadRate() const
+ 	{
+-		QMutexLocker locker(&mutex);
+ 		if (sock)
+ 		{
+ 			sock->updateSpeeds(bt::CurrentTime());
diff --git a/libktorrent.spec b/libktorrent.spec
index 06b94cf..173f3e4 100644
--- a/libktorrent.spec
+++ b/libktorrent.spec
@@ -2,13 +2,19 @@
 
 Name:    libktorrent
 Version: 1.2.0
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
 Summary: Library providing torrent downloading code
 
 Group:   System Environment/Libraries
 License: GPLv2+
 URL:     http://ktorrent.org/
 Source0: http://ktorrent.org/downloads/4.2.0%{?pre}/libktorrent-%{version}%{?pre}.tar.bz2
+
+## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=295719
+# https://projects.kde.org/projects/extragear/network/libktorrent/repository/revisions/1ea7a2e39aac91080d36bfc4898af3737270a122
+Patch100: libktorrent-1.2.0-webseed_deadlock.patch 
+
 BuildRequires: boost-devel
 BuildRequires: gettext
 BuildRequires: gmp-devel
@@ -35,6 +41,9 @@ Requires: kdelibs4-devel%{?_isa}
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
 
+%patch100 -p1 -b .webseed_deadlock
+
+
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -57,10 +66,8 @@ rm -rf %{buildroot}
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING
@@ -74,6 +81,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 29 2012 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-2
+- KTorrent freezes on start (#808178)
+
 * Mon Mar  5 2012 Alexey Kurov <nucleo at fedoraproject.org> - 1.2.0-1
 - libktorrent-1.2.0