[arch-commits] Commit in kdepim/trunk (PKGBUILD akonadi.patch)

[Andrea Scarpino]

    Date: Friday, February 26, 2010 @ 15:50:41
  Author: andrea
Revision: 70459

updated for 4.4.1

Modified:
  kdepim/trunk/PKGBUILD
Deleted:
  kdepim/trunk/akonadi.patch

---------------+
 PKGBUILD      |   16 +++++-----------
 akonadi.patch |   23 -----------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-26 20:50:37 UTC (rev 70458)
+++ PKGBUILD	2010-02-26 20:50:41 UTC (rev 70459)
@@ -19,25 +19,19 @@
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
          'kdepim-wizards')
-pkgver=4.4.0
-pkgrel=2
+pkgver=4.4.1
+pkgrel=1
 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"
-        'akonadi.patch')
-md5sums=('a354448eebd4fd4b50739c4f20b90e20'
-         '7edc764bb8e328dd73182a068ba275d3')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('2e98fbd8270a95e7ab4e2dcee41cf40c')
 
 build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-	# fix akonadi startup for kontact
-	# part of KDE 4.4.1
-	patch -p0 -i ${srcdir}/akonadi.patch || return 1
-	cd ..
+	cd ${srcdir}
 	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \

Deleted: akonadi.patch
===================================================================
--- akonadi.patch	2010-02-26 20:50:37 UTC (rev 70458)
+++ akonadi.patch	2010-02-26 20:50:41 UTC (rev 70459)
@@ -1,23 +0,0 @@
-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.