[arch-commits] Commit in akonadi/trunk (PKGBUILD qt-plugins-path.patch)

[Andrea Scarpino]

    Date: Friday, March 18, 2011 @ 05:32:06
  Author: andrea
Revision: 115515

upgpkg: akonadi 1.5.1-2
fix libqsqlite3.so path (FS#23321)

Added:
  akonadi/trunk/qt-plugins-path.patch
Modified:
  akonadi/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   11 ++++++++---
 qt-plugins-path.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-18 09:09:09 UTC (rev 115514)
+++ PKGBUILD	2011-03-18 09:32:06 UTC (rev 115515)
@@ -4,7 +4,7 @@
 
 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://pim.kde.org/akonadi'
@@ -12,10 +12,15 @@
 depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 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
   cd build

Added: qt-plugins-path.patch
===================================================================
--- qt-plugins-path.patch	                        (rev 0)
+++ qt-plugins-path.patch	2011-03-18 09:32:06 UTC (rev 115515)
@@ -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)