[Pkg-voip-commits] r7789 - in /qutecom/trunk/debian: changelog patches/debian/remove-extra-copying-file.patch patches/generic/cleanlook-startup-fix.patch patches/generic/track-sipaccount-init.patch patches/series
cavedon-guest at alioth.debian.org
cavedon-guest at alioth.debian.org
Thu Nov 12 07:32:53 UTC 2009
Author: cavedon-guest
Date: Thu Nov 12 07:32:53 2009
New Revision: 7789
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7789
Log:
* Add generic/cleanlook-startup-fix.patch: tentative fix for startup freeze
(#546852).
* Refresh two patches.
Added:
qutecom/trunk/debian/patches/generic/cleanlook-startup-fix.patch
Modified:
qutecom/trunk/debian/changelog
qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch
qutecom/trunk/debian/patches/series
Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=7789&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Thu Nov 12 07:32:53 2009
@@ -9,8 +9,10 @@
* Add head/fix-build-newer-ffmpeg.patch to avoid FTBFS with the newer ffmpeg
libraries.
* Add correct support for "noopt" in DEB_BUILD_OPTIONS.
-
- -- Ludovico Cavedon <ludovico.cavedon at gmail.com> Wed, 11 Nov 2009 01:21:14 -0800
+ * Add generic/cleanlook-startup-fix.patch: tentative fix for startup freeze
+ (#546852).
+
+ -- Ludovico Cavedon <ludovico.cavedon at gmail.com> Wed, 11 Nov 2009 23:32:16 -0800
qutecom (2.2~rc3.hg396~dfsg1-2) unstable; urgency=low
Modified: qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch?rev=7789&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch (original)
+++ qutecom/trunk/debian/patches/debian/remove-extra-copying-file.patch Thu Nov 12 07:32:53 2009
@@ -1,9 +1,9 @@
Do not copy COPYING and AUTHORS files into /usr/share/qutecom
Index: qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/presentation/qt/CMakeLists-install-linux.txt
===================================================================
---- qutecom-2.2~rc3.hg396~dfsg1.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2008-02-26 10:06:40.000000000 -0800
-+++ qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2009-05-15 21:41:35.000000000 -0700
-@@ -84,7 +84,3 @@
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2009-11-11 23:25:47.000000000 -0800
++++ qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/presentation/qt/CMakeLists-install-linux.txt 2009-11-11 23:26:36.000000000 -0800
+@@ -86,7 +86,3 @@
RENAME qutecom.png)
endforeach(size)
Added: qutecom/trunk/debian/patches/generic/cleanlook-startup-fix.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/cleanlook-startup-fix.patch?rev=7789&op=file
==============================================================================
--- qutecom/trunk/debian/patches/generic/cleanlook-startup-fix.patch (added)
+++ qutecom/trunk/debian/patches/generic/cleanlook-startup-fix.patch Thu Nov 12 07:32:53 2009
@@ -1,0 +1,27 @@
+Description: tentative fix for cleanlook startup deadlock
+Author: Ludovico cavedon <ludovico.cavedon at gmail.com>
+Bug-Debian: http://bugs.debian.org/546852
+Forwarded: http://trac.qutecom.com/ticket/154
+
+# HG changeset patch
+# User Ludovico Cavedon <ludovico.cavedon at gmail.com>
+# Date 1258010640 28800
+# Node ID 48bc039f4f7c4d956a48e8ff781a4e0786e94bd8
+# Parent b4bdeca777e54b947efd096b06c32b962cf21322
+tentative fix for cleanlook startup deadlock
+
+diff -r b4bdeca777e5 -r 48bc039f4f7c wengophone/src/presentation/qt/QtWengoStyle.h
+--- a/wengophone/src/presentation/qt/QtWengoStyle.h Wed Nov 11 16:01:23 2009 +0100
++++ b/wengophone/src/presentation/qt/QtWengoStyle.h Wed Nov 11 23:24:00 2009 -0800
+@@ -115,9 +115,10 @@
+ return _systemStyle->standardPalette();
+ }
+
++ /*
+ QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption * option = 0, const QWidget * widget = 0) const {
+ return _systemStyle->standardPixmap(standardPixmap, option, widget);
+- }
++ }*/
+
+ QRect subControlRect(ComplexControl control, const QStyleOptionComplex * option, SubControl subControl, const QWidget * widget = 0) const {
+ return _systemStyle->subControlRect(control, option, subControl, widget);
Modified: qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch?rev=7789&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch (original)
+++ qutecom/trunk/debian/patches/generic/track-sipaccount-init.patch Thu Nov 12 07:32:53 2009
@@ -10,9 +10,10 @@
# Parent 32faa7d90a062c1a37d319f7f8f585054a371364
avoid calls to NetworkObserver in ~SipAccount() when SipAccount has not been initialzed
-diff -r 32faa7d90a06 -r 2d714ab6a3f4 wengophone/src/model/account/SipAccount.cpp
---- a/wengophone/src/model/account/SipAccount.cpp Sun Sep 27 16:24:36 2009 +0200
-+++ b/wengophone/src/model/account/SipAccount.cpp Tue Nov 10 16:33:43 2009 -0800
+Index: qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/model/account/SipAccount.cpp
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/wengophone/src/model/account/SipAccount.cpp 2009-05-22 20:49:45.000000000 -0700
++++ qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/model/account/SipAccount.cpp 2009-11-11 23:25:36.000000000 -0800
@@ -48,6 +48,7 @@
_visibleName = "";
_voicemail = "123";
@@ -40,9 +41,10 @@
_initSuccessful = false;
if (NetworkObserver::getInstance().isConnected()) {
-diff -r 32faa7d90a06 -r 2d714ab6a3f4 wengophone/src/model/account/SipAccount.h
---- a/wengophone/src/model/account/SipAccount.h Sun Sep 27 16:24:36 2009 +0200
-+++ b/wengophone/src/model/account/SipAccount.h Tue Nov 10 16:33:43 2009 -0800
+Index: qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/model/account/SipAccount.h
+===================================================================
+--- qutecom-2.2~rc3.hg396~dfsg1.orig/wengophone/src/model/account/SipAccount.h 2009-05-22 20:49:45.000000000 -0700
++++ qutecom-2.2~rc3.hg396~dfsg1/wengophone/src/model/account/SipAccount.h 2009-11-11 23:25:36.000000000 -0800
@@ -561,6 +561,9 @@
Timer _initTimer;
Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=7789&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Thu Nov 12 07:32:53 2009
@@ -2,6 +2,7 @@
#generic/curl-openssl-mt-fix.patch
generic/google-breakpad-gcc44.patch
generic/track-sipaccount-init.patch
+generic/cleanlook-startup-fix.patch
debian/cmake-noavformat.patch
debian/remove-extra-copying-file.patch
debian/cmake-force-fpic.patch
More information about the Pkg-voip-commits
mailing list