[Pkg-voip-commits] r4258 - in wengophone/trunk/debian: . patches patches/generic patches/head

[cavedon-guest at alioth.debian.org]

Author: cavedon-guest
Date: 2007-08-23 16:37:42 +0000 (Thu, 23 Aug 2007)
New Revision: 4258

Added:
   wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch
Removed:
   wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/control
   wengophone/trunk/debian/patches/series
Log:
* Modified qobjectthreadsafe-fix-qt42.patch to initialize _blockEvents
  before calling moveToThread()
* Changed Build-Depends from libcurl3-openssl-dev to libcurl4-dev (cleaner
  valgrind output!)


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2007-08-23 13:18:32 UTC (rev 4257)
+++ wengophone/trunk/debian/changelog	2007-08-23 16:37:42 UTC (rev 4258)
@@ -19,8 +19,12 @@
     from ffmpeg. Closes: #434389
   * Added desktop-file-update.patch to remove deprecated "Encoding" line
     (lintian info desktop-entry-contains-encoding-key)
+  * Modified qobjectthreadsafe-fix-qt42.patch to initialize _blockEvents
+    before calling moveToThread()
+  * Changed Build-Depends from libcurl3-openssl-dev to libcurl4-dev (cleaner
+    valgrind output!)
 
- -- Ludovico Cavedon <cavedon at sssup.it>  Thu, 23 Aug 2007 11:40:32 +0000
+ -- Ludovico Cavedon <cavedon at sssup.it>  Thu, 23 Aug 2007 16:35:03 +0000
 
 wengophone (2.1.1.dfsg0-2) unstable; urgency=low
 

Modified: wengophone/trunk/debian/control
===================================================================
--- wengophone/trunk/debian/control	2007-08-23 13:18:32 UTC (rev 4257)
+++ wengophone/trunk/debian/control	2007-08-23 16:37:42 UTC (rev 4258)
@@ -13,7 +13,7 @@
  libboost-program-options-dev (>= 1.34.0-1), uuid-dev,
  libasound2-dev (>= 1.0.11), libspeex-dev (>= 1.1.12), libssl-dev (>= 0.9.8a),
  libxml2-dev (>= 2.6.24), libsamplerate0-dev (>= 0.1.2),
- libsndfile1-dev (>= 1.0.12), libcurl4-openssl-dev (>= 7.16.1),
+ libsndfile1-dev (>= 1.0.12), libcurl4-dev (>= 7.16.1),
  dpkg-dev (>= 1.13.19)
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-voip/wengophone/trunk

Added: wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch	                        (rev 0)
+++ wengophone/trunk/debian/patches/generic/qobjectthreadsafe-fix-qt42.patch	2007-08-23 16:37:42 UTC (rev 4258)
@@ -0,0 +1,28 @@
+Index: wengophone-2.1.1.dfsg0/libs/qtutil/src/QObjectThreadSafe.cpp
+===================================================================
+--- wengophone-2.1.1.dfsg0.orig/libs/qtutil/src/QObjectThreadSafe.cpp	2006-08-11 22:15:03.000000000 +0000
++++ wengophone-2.1.1.dfsg0/libs/qtutil/src/QObjectThreadSafe.cpp	2007-08-23 16:26:38.000000000 +0000
+@@ -20,11 +20,20 @@
+ #include <qtutil/QObjectThreadSafe.h>
+ 
+ #include <QtCore/QCoreApplication>
++#include <QtCore/QThread>
+ 
+ QObjectThreadSafe::QObjectThreadSafe(QObject * parent)
+-	: QObject(parent) {
+-
+-	_blockEvents = false;
++	: QObject(parent), _blockEvents(false) {
++#if QT_VERSION >= 0x040200
++	// This is needed with Qt 4.2 and later. See Trac ticket #1322.
++	//
++	// If an object has a parent, its thread must be the current one. See
++	// http://doc.trolltech.com/4.3/qobject.html#moveToThread for more info.
++	assert(!parent || parent->thread() == QThread::currentThread());
++	if(!parent) {
++		moveToThread(QCoreApplication::instance()->thread());
++	}
++#endif
+ }
+ 
+ QObjectThreadSafe::~QObjectThreadSafe() {

Deleted: wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch
===================================================================
--- wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch	2007-08-23 13:18:32 UTC (rev 4257)
+++ wengophone/trunk/debian/patches/head/qobjectthreadsafe-fix-qt42.patch	2007-08-23 16:37:42 UTC (rev 4258)
@@ -1,18 +0,0 @@
-diff -urNad wengophone-2.1.1~/libs/qtutil/src/QObjectThreadSafe.cpp wengophone-2.1.1/libs/qtutil/src/QObjectThreadSafe.cpp
---- wengophone-2.1.1~/libs/qtutil/src/QObjectThreadSafe.cpp	2006-08-12 00:15:03.000000000 +0200
-+++ wengophone-2.1.1/libs/qtutil/src/QObjectThreadSafe.cpp	2007-07-04 10:59:41.000000000 +0200
-@@ -20,10 +20,13 @@
- #include <qtutil/QObjectThreadSafe.h>
- 
- #include <QtCore/QCoreApplication>
-+#include <QtCore/QThread>
- 
- QObjectThreadSafe::QObjectThreadSafe(QObject * parent)
- 	: QObject(parent) {
--
-+	assert(!parent || parent->thread() == QThread::currentThread());
-+	if(!parent)
-+	  moveToThread(QCoreApplication::instance()->thread());
- 	_blockEvents = false;
- }
- 

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2007-08-23 13:18:32 UTC (rev 4257)
+++ wengophone/trunk/debian/patches/series	2007-08-23 16:37:42 UTC (rev 4258)
@@ -1,6 +1,6 @@
 head/phapi-disable-iLBC-codec.patch
-head/qobjectthreadsafe-fix-qt42.patch
 head/alsa-plughw-default.patch
+generic/qobjectthreadsafe-fix-qt42.patch
 generic/cmake-fix-ENABLE_CRASHREPORT.patch
 generic/cmake-static-coredumper.patch
 generic/exosip-fix-empty-notify.patch