rev 17775 - in trunk/packages/kdepimlibs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-05-01 20:56:52 +0000 (Sat, 01 May 2010)
New Revision: 17775

Added:
   trunk/packages/kdepimlibs/debian/patches/02_increase_fail_timeout.diff
   trunk/packages/kdepimlibs/debian/patches/03_hide_akonadi_progressbar.diff
Modified:
   trunk/packages/kdepimlibs/debian/changelog
   trunk/packages/kdepimlibs/debian/patches/series
Log:
* Steal a couple of patches from Kubuntu (to workaround annoying bugs):
  - 02_increase_fail_timeout.diff - give more time (60 seconds) for akonadi
    server to start. Current timeout (10 seconds) was not enough on many
    machines. To make things worse, kdepimlibs would just call exit() after
    showing error detection dialog causing unexpected termination of the
    application.
  - 03_hide_akonadi_progressbar.diff - hide akonadi start/stop progress bar
    as it is already done in KDE trunk. It was not a real progress bar anyway
    and just confused users.

Modified: trunk/packages/kdepimlibs/debian/changelog
===================================================================
--- trunk/packages/kdepimlibs/debian/changelog	2010-05-01 20:23:07 UTC (rev 17774)
+++ trunk/packages/kdepimlibs/debian/changelog	2010-05-01 20:56:52 UTC (rev 17775)
@@ -7,6 +7,15 @@
   * Confirm symbols files for 4.4.2 on ia64 kfreebsd-amd64 kfreebsd-i386
     powerpc s390 sparc.
   * Update symbol files for 4.4.3 on amd64.
+  * Steal a couple of patches from Kubuntu (to workaround annoying bugs):
+    - 02_increase_fail_timeout.diff - give more time (60 seconds) for akonadi
+      server to start. Current timeout (10 seconds) was not enough on many
+      machines. To make things worse, kdepimlibs would just call exit() after
+      showing error detection dialog causing unexpected termination of the
+      application.
+    - 03_hide_akonadi_progressbar.diff - hide akonadi start/stop progress bar
+      as it is already done in KDE trunk. It was not a real progress bar anyway
+      and just confused users.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 30 Apr 2010 13:33:07 +0300
 

Added: trunk/packages/kdepimlibs/debian/patches/02_increase_fail_timeout.diff
===================================================================
--- trunk/packages/kdepimlibs/debian/patches/02_increase_fail_timeout.diff	                        (rev 0)
+++ trunk/packages/kdepimlibs/debian/patches/02_increase_fail_timeout.diff	2010-05-01 20:56:52 UTC (rev 17775)
@@ -0,0 +1,18 @@
+Author: Harald Sitter
+Description: give more time for akonadi-server to start
+ 10 seconds is way too short timeframe. To make things worse, kdepimlibs just
+ calls exit() after showing error detection dialog. The patch was stolen from
+ Kubuntu.
+Origin: vendor, http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/kdepimlibs/lucid/download/head:/kubuntu_01_increase_-20100413181428-vr64cd6ivtkqbzhp-2/kubuntu_01_increase_fail_timeout.patch
+
+--- a/akonadi/control.cpp
++++ b/akonadi/control.cpp
+@@ -133,7 +133,7 @@
+   kDebug() << "Starting Akonadi (using an event loop).";
+   mEventLoop = new QEventLoop( mParent );
+   // safety timeout
+-  QTimer::singleShot( 10000, mEventLoop, SLOT(quit()) );
++  QTimer::singleShot( 60000, mEventLoop, SLOT(quit()) );
+   mEventLoop->exec();
+   mEventLoop->deleteLater();
+   mEventLoop = 0;

Added: trunk/packages/kdepimlibs/debian/patches/03_hide_akonadi_progressbar.diff
===================================================================
--- trunk/packages/kdepimlibs/debian/patches/03_hide_akonadi_progressbar.diff	                        (rev 0)
+++ trunk/packages/kdepimlibs/debian/patches/03_hide_akonadi_progressbar.diff	2010-05-01 20:56:52 UTC (rev 17775)
@@ -0,0 +1,18 @@
+Description: Hide start/stop progressbar as done in KDE trunk
+ The patch stolen from Kubuntu
+Origin: vendor, http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/kdepimlibs/lucid/download/head:/kubuntu_02_hide_akon-20100413181428-vr64cd6ivtkqbzhp-1/kubuntu_02_hide_akonadi_progressbar.patch
+Bug-Kubuntu: https://launchpad.net/bugs/562420
+
+--- a/akonadi/control.cpp
++++ b/akonadi/control.cpp
+@@ -127,8 +127,8 @@
+ 
+ bool Control::Private::exec()
+ {
+-  if ( mProgressIndicator )
+-    mProgressIndicator->show();
++//  if ( mProgressIndicator )
++//    mProgressIndicator->show();
+ 
+   kDebug() << "Starting Akonadi (using an event loop).";
+   mEventLoop = new QEventLoop( mParent );

Modified: trunk/packages/kdepimlibs/debian/patches/series
===================================================================
--- trunk/packages/kdepimlibs/debian/patches/series	2010-05-01 20:23:07 UTC (rev 17774)
+++ trunk/packages/kdepimlibs/debian/patches/series	2010-05-01 20:56:52 UTC (rev 17775)
@@ -1 +1,3 @@
 01_hurd_support.diff
+02_increase_fail_timeout.diff
+03_hide_akonadi_progressbar.diff