Date: Wednesday, February 10, 2010 @ 10:13:28 Author: pierre Revision: 68039
Merged revisions 68019 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdepim/trunk ........ r68019 | pierre | 2010-02-10 15:07:00 +0100 (Mi, 10 Feb 2010) | 1 line fix kontact ........ Added: kdepim/repos/extra-i686/akonadi.patch (from rev 68019, kdepim/trunk/akonadi.patch) Modified: kdepim/repos/extra-i686/ (properties) kdepim/repos/extra-i686/PKGBUILD ---------------+ PKGBUILD | 14 ++++++++++---- akonadi.patch | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) Property changes on: kdepim/repos/extra-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /kdepim/trunk:1-67655 + /kdepim/trunk:1-68037 Modified: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2010-02-10 15:13:03 UTC (rev 68038) +++ extra-i686/PKGBUILD 2010-02-10 15:13:28 UTC (rev 68039) @@ -20,18 +20,24 @@ 'kdepim-libkdepim' 'kdepim-wizards') pkgver=4.4.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdelibs' 'kdepimlibs' 'kdepim-runtime' 'gnokii' 'libxss' 'kdebase-runtime' 'pilot-link' 'kde-agent') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('a354448eebd4fd4b50739c4f20b90e20') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'akonadi.patch') +md5sums=('a354448eebd4fd4b50739c4f20b90e20' + '7edc764bb8e328dd73182a068ba275d3') build() { - cd ${srcdir} + cd ${srcdir}/${pkgbase}-${pkgver} + # fix akonadi startup for kontact + # part of KDE 4.4.1 + patch -p0 -i ${srcdir}/akonadi.patch || return 1 + cd .. mkdir build cd build cmake ../${pkgbase}-${pkgver} \ Copied: kdepim/repos/extra-i686/akonadi.patch (from rev 68019, kdepim/trunk/akonadi.patch) =================================================================== --- extra-i686/akonadi.patch (rev 0) +++ extra-i686/akonadi.patch 2010-02-10 15:13:28 UTC (rev 68039) @@ -0,0 +1,23 @@ +Index: kontact/src/main.cpp +=================================================================== +--- kontact/src/main.cpp (Revision 1087777) ++++ kontact/src/main.cpp (Revision 1087778) +@@ -138,7 +138,6 @@ + mMainWindow->setInitialActivePluginModule( moduleName ); + } + mMainWindow->show(); +- Akonadi::Control::start( mMainWindow ); + KontactInterface::UniqueAppHandler::setMainWidget( mMainWindow ); + // --iconify is needed in kontact, although kstart can do that too, + // because kstart returns immediately so it's too early to talk D-Bus to the app. +@@ -200,6 +199,10 @@ + + KontactApp app; + ++ // 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 ); ++ + // 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 + // tray.