From 80dfd022209cb3577fbc3fff232aa9f86e13e54a Mon Sep 17 00:00:00 2001
From: philm <philm@chakra-project.org>
Date: Wed, 23 Mar 2011 01:03:14 +0100
Subject: [PATCH] update akonadi

---
 support-pkg-akonadi/PKGBUILD              | 12 ++++++++----
 support-pkg-akonadi/qt-plugins-path.patch | 24 +++++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 support-pkg-akonadi/qt-plugins-path.patch

diff --git a/support-pkg-akonadi/PKGBUILD b/support-pkg-akonadi/PKGBUILD
index c091a58dc..d1dcd9ba9 100644
--- a/support-pkg-akonadi/PKGBUILD
+++ b/support-pkg-akonadi/PKGBUILD
@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=akonadi
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://www.akonadi-project.org'
@@ -17,12 +17,16 @@ license=('LGPL')
 depends=('shared-mime-info' 'boost' 'mysql>=5.5.10' 'soprano>=2.6.0')
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 install=$pkgname.install
-source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4225b064cac6553c22cbeca9a8f93c25')
+source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2"
+        'qt-plugins-path.patch')
+md5sums=('4225b064cac6553c22cbeca9a8f93c25'
+        '9e8ad893d8e8d7af2c4f89429e32e367')
 
 build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/qt-plugins-path.patch
   cd ${srcdir}
-  mkdir build
+  mkdir -p build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/support-pkg-akonadi/qt-plugins-path.patch b/support-pkg-akonadi/qt-plugins-path.patch
new file mode 100644
index 000000000..cba420122
--- /dev/null
+++ b/support-pkg-akonadi/qt-plugins-path.patch
@@ -0,0 +1,24 @@
+--- akonadi-1.5.1/libs/xdgbasedirs.cpp~	2011-03-18 02:18:19.543333786 -0700
++++ akonadi-1.5.1/libs/xdgbasedirs.cpp	2011-03-18 02:19:15.893335157 -0700
+@@ -313,7 +313,7 @@
+ QString XdgBaseDirs::findPluginFile( const QString &relPath, const QStringList &searchPath )
+ {
+   if ( instance()->mPluginDirs.isEmpty() ) {
+-    QStringList pluginDirs = instance()->systemPathList( "QT_PLUGIN_PATH", AKONADILIB ":" AKONADILIB "/qt4/plugins/:" AKONADILIB "/kde4/:" AKONADILIB "/kde4/plugins/:/usr/lib/qt4/plugins/" );
++    QStringList pluginDirs = instance()->systemPathList( "QT_PLUGIN_PATH", AKONADILIB ":" AKONADILIB "/qt/plugins/:" AKONADILIB "/kde4/:" AKONADILIB "/kde4/plugins/:/usr/lib/qt/plugins/" );
+ 
+     if ( QCoreApplication::instance() != 0 ) {
+       foreach ( const QString &libraryPath, QCoreApplication::instance()->libraryPaths() ) {
+--- akonadi-1.5.1/qsqlite/CMakeLists.txt~	2011-03-18 02:22:50.976674875 -0700
++++ akonadi-1.5.1/qsqlite/CMakeLists.txt	2011-03-18 02:23:07.370000620 -0700
+@@ -14,8 +14,8 @@
+ if (INSTALL_QSQLITE_IN_QT_PREFIX)
+   set(QSQLITE_INSTALL_PREFIX "${QT_PLUGINS_DIR}/sqldrivers")
+ else()
+-  set(QSQLITE_INSTALL_PREFIX "${LIB_INSTALL_DIR}/qt4/plugins/sqldrivers")
+-  message(STATUS "Make sure that you add ${LIB_INSTALL_DIR}/qt4/plugins to your QT_PLUGIN_PATH environment variable.")
++  set(QSQLITE_INSTALL_PREFIX "${LIB_INSTALL_DIR}/qt/plugins/sqldrivers")
++  message(STATUS "Make sure that you add ${LIB_INSTALL_DIR}/qt/plugins to your QT_PLUGIN_PATH environment variable.")
+ endif()
+ 
+ add_definitions(-Wall)