[arch-commits] Commit in kdepim/trunk (PKGBUILD asynchronous-start.patch)
Andrea Scarpino
andrea at archlinux.org
Fri Apr 22 00:23:46 UTC 2011
Date: Thursday, April 21, 2011 @ 20:23:46
Author: andrea
Revision: 120278
upgpkg: kdepim 4.4.11.1-1
upstream release
Modified:
kdepim/trunk/PKGBUILD
Deleted:
kdepim/trunk/asynchronous-start.patch
--------------------------+
PKGBUILD | 15 ++-----
asynchronous-start.patch | 87 ---------------------------------------------
2 files changed, 5 insertions(+), 97 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-04-22 00:23:16 UTC (rev 120277)
+++ PKGBUILD 2011-04-22 00:23:46 UTC (rev 120278)
@@ -20,23 +20,18 @@
'kdepim-ktimetracker'
'kdepim-libkdepim'
'kdepim-wizards')
-pkgver=4.4.10
-pkgrel=2
+pkgver=4.4.11.1
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdepim')
makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
- 'pilot-link' 'kde-agent' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'asynchronous-start.patch')
-sha1sums=('b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3'
- '3816d618026b85500a21753395712cd91de6e31b')
+ 'pilot-link' 'kde-agent')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2')
build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -Np1 -i ${srcdir}/asynchronous-start.patch
-
cd ${srcdir}
mkdir build
cd build
Deleted: asynchronous-start.patch
===================================================================
--- asynchronous-start.patch 2011-04-22 00:23:16 UTC (rev 120277)
+++ asynchronous-start.patch 2011-04-22 00:23:46 UTC (rev 120278)
@@ -1,87 +0,0 @@
-commit cfa404b7188e4c26bddbc9579728f6d25f8cd214
-Author: Stephen Kelly <steveire at gmail.com>
-Date: Tue Apr 5 11:09:43 2011 +0200
-
- Start kdepim 4.4 asynchronously if built against 4.6.
-
- The synchronous mechanism doesn't have enough time to start
- before it reports failure.
-
-diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
-index 4c8ca42..200f8ec 100644
---- a/kaddressbook/main.cpp
-+++ b/kaddressbook/main.cpp
-@@ -49,11 +49,13 @@ int main( int argc, char **argv )
- MainWindow *window = new MainWindow;
- window->show();
-
-+#if !KDE_IS_VERSION(4,6,0)
- if ( !Akonadi::Control::start( window ) ) {
- //TODO: add message box after string freeze
- kWarning() << "Unable to start Akonadi server, exit application";
- return 1;
- }
-+#endif
-
- return app.exec();
- }
-diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
-index a31973a..10b14e4 100644
---- a/kmail/kmmainwidget.cpp
-+++ b/kmail/kmmainwidget.cpp
-@@ -165,6 +165,9 @@ using KMail::TemplateParser;
-
- #include <errno.h> // ugh
-
-+#include <akonadi/control.h>
-+#include <akonadi/servermanager.h>
-+
- #include "kmmainwidget.moc"
-
- K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
-@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
- mVacationIndicatorActive( false ),
- mGoToFirstUnreadMessageInSelectedFolder( false )
- {
-+#if KDE_IS_VERSION(4,6,0)
-+ Akonadi::Control::widgetNeedsAkonadi(this);
-+ Akonadi::ServerManager::start();
-+#endif
- // must be the first line of the constructor:
- mStartupDone = false;
- mWasEverShown = false;
-diff --git a/kmail/main.cpp b/kmail/main.cpp
-index f39ca5f..c2dd1c3 100644
---- a/kmail/main.cpp
-+++ b/kmail/main.cpp
-@@ -145,12 +145,14 @@ int main(int argc, char *argv[])
- app.setEventLoopReached();
- app.delayedInstanceCreation();
-
-+#if !KDE_IS_VERSION(4,6,0)
- // Start Akonadi
- if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
- //TODO: add message box after string freeze
- kWarning() << "Unable to start Akonadi server, exit application";
- return 1;
- }
-+#endif
-
- // Go!
- int ret = qApp->exec();
-diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
-index 356aa57..cb4a235 100644
---- a/kontact/src/main.cpp
-+++ b/kontact/src/main.cpp
-@@ -199,9 +199,11 @@ int main( int argc, char **argv )
-
- KontactApp app;
-
-+#if !KDE_IS_VERSION(4,6,0)
- // KDE 4.4: do akonadi startup before creating any window, since creating
- // the window loads kmail. In 4.5 we'll do this startup async instead.
- Akonadi::Control::start( 0 );
-+#endif
-
- // Qt doesn't treat the system tray as a window, and therefore Qt would quit
- // the event loop when an error message is clicked away while Kontact is in the
More information about the arch-commits
mailing list