[Pkg-voip-commits] r6585 - in /qutecom/trunk/debian: changelog patches/generic/wengophone-thread-destruction.patch patches/series

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: Sat Dec 27 09:47:46 2008
New Revision: 6585

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6585
Log:
generic/wengophone-thread-destruction.patch: prevent segafault at exit

Added:
    qutecom/trunk/debian/patches/generic/wengophone-thread-destruction.patch
Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/patches/series

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=6585&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Sat Dec 27 09:47:46 2008
@@ -9,11 +9,12 @@
       re-initialization.
     - generic/ffmpeg-api-52.patch: fix compilation with new ffmpeg API.
     - head/cmake-swscale.patch: fix typo in build scripts
+    - generic/wengophone-thread-destruction.patch: prevent segafault at exit
   * Drop build dependency on libavformat-dev (no need for it, use newer
     lib swscale instead) and add debian/cmake-noavformat.patch in order not to
     look for that library during configuration.
 
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Fri, 26 Dec 2008 18:01:08 +0100
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com>  Sat, 27 Dec 2008 10:46:55 +0100
 
 qutecom (2.2~rc2.dfsg0-1) experimental; urgency=low
 

Added: qutecom/trunk/debian/patches/generic/wengophone-thread-destruction.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/wengophone-thread-destruction.patch?rev=6585&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/wengophone-thread-destruction.patch (added)
+++ qutecom/trunk/debian/patches/generic/wengophone-thread-destruction.patch Sat Dec 27 09:47:46 2008
@@ -1,0 +1,15 @@
+Index: qutecom-2.2~rc3.dfsg0/wengophone/src/model/WengoPhone.cpp
+===================================================================
+--- qutecom-2.2~rc3.dfsg0.orig/wengophone/src/model/WengoPhone.cpp	2008-12-27 10:15:36.000000000 +0100
++++ qutecom-2.2~rc3.dfsg0/wengophone/src/model/WengoPhone.cpp	2008-12-27 10:19:13.000000000 +0100
+@@ -89,6 +89,10 @@
+ }
+ 
+ WengoPhone::~WengoPhone() {
++        // make sure WengoPhone::run() has terminated
++        Thread::terminate(); // should not be needed, but let's avoid potential deadlock
++        Thread::join();
++
+ 	//Deleting created objects
+ 	OWSAFE_DELETE(_userProfileHandler);
+ 	OWSAFE_DELETE(_dtmfThemeManager);

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=6585&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Sat Dec 27 09:47:46 2008
@@ -3,6 +3,7 @@
 generic/cmake-install-missing-endif.patch
 generic/imwrapper-safe-reinit.patch
 generic/ffmpeg-api-52.patch
+generic/wengophone-thread-destruction.patch
 debian/cmake-noavformat.patch
 debian/remove-extra-copying-file.patch
 debian/cmake-force-fpic.patch