Date: Friday, March 18, 2011 @ 20:33:17
Author: andrea
Revision: 115664
proper way
Modified:
akonadi/trunk/PKGBUILD
Deleted:
akonadi/trunk/qt-plugins-path.patch
-----------------------+
PKGBUILD | 12 ++++--------
qt-plugins-path.patch | 24 ------------------------
2 files changed, 4 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-03-18 21:30:48 UTC (rev 115663)
+++ PKGBUILD 2011-03-19 00:33:17 UTC (rev 115664)
@@ -12,21 +12,17 @@
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";
- 'qt-plugins-path.patch')
-md5sums=('4225b064cac6553c22cbeca9a8f93c25'
- '9e8ad893d8e8d7af2c4f89429e32e367')
+source=("http://download.akonadi-project.org/${pkgname}-${pkgver}.tar.bz2";)
+md5sums=('4225b064cac6553c22cbeca9a8f93c25')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/qt-plugins-path.patch
-
cd ${srcdir}
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
make
}
Deleted: qt-plugins-path.patch
===================================================================
--- qt-plugins-path.patch 2011-03-18 21:30:48 UTC (rev 115663)
+++ qt-plugins-path.patch 2011-03-19 00:33:17 UTC (rev 115664)
@@ -1,24 +0,0 @@
---- 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)
