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

[Andrea Scarpino]

    Date: Saturday, June 8, 2013 @ 10:31:22
  Author: andrea
Revision: 188069

upgpkg: akonadi 1.9.2-2

Fix build with boost 1.53; add postgreSQL as optional deps

Added:
  akonadi/trunk/boost153.patch
Modified:
  akonadi/trunk/PKGBUILD

----------------+
 PKGBUILD       |   22 ++++++++++++++++------
 boost153.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-08 08:18:14 UTC (rev 188068)
+++ PKGBUILD	2013-06-08 08:31:22 UTC (rev 188069)
@@ -4,25 +4,35 @@
 
 pkgname=akonadi
 pkgver=1.9.2
-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://community.kde.org/KDE_PIM/Akonadi'
 license=('LGPL')
 depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
+makedepends=('cmake' 'automoc4' 'boost' 'postgresql')
+optdepends=('postgresql: PostgreSQL backend')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bdce288f4b91055d69f35c26dab276d0')
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2"
+        'boost153.patch')
+md5sums=('bdce288f4b91055d69f35c26dab276d0'
+         'd797b338914c677fb6b93c0c23f46197')
 
+prepare() {
+  mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/boost153.patch
+}
+
 build() {
-  mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
-    -DQT_QMAKE_EXECUTABLE=qmake-qt4
+    -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+    -DAKONADI_BUILD_TESTS=OFF
   make
 }
 

Added: boost153.patch
===================================================================
--- boost153.patch	                        (rev 0)
+++ boost153.patch	2013-06-08 08:31:22 UTC (rev 188069)
@@ -0,0 +1,27 @@
+From: Sergio Martins <iamsergio at gmail.com>
+Date: Tue, 28 May 2013 20:22:11 +0000
+Subject: Compile with boost-1.53
+X-Git-Url: http://quickgit.kde.org/?p=akonadi.git&a=commitdiff&h=fe3f49cbd21a634c3257903a229b7d5357ee194a
+---
+Compile with boost-1.53
+
+The bug isn't going to be fixed in Qt4, so we need the ifdef.
+
+CCMAIL: vkrause at kde.org
+---
+
+
+--- a/shared/akapplication.h
++++ b/shared/akapplication.h
+@@ -23,7 +23,9 @@
+ #include <QtCore/QObject>
+ 
+ #ifndef _WIN32_WCE
+-#include <boost/program_options.hpp>
++# ifndef Q_MOC_RUN
++#  include <boost/program_options.hpp>
++# endif
+ #endif
+ 
+ class QCoreApplication;
+