[arch-commits] Commit in akonadi/repos (10 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sat Jun 8 08:31:34 UTC 2013
Date: Saturday, June 8, 2013 @ 10:31:33
Author: andrea
Revision: 188070
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
akonadi/repos/extra-i686/PKGBUILD
(from rev 188069, akonadi/trunk/PKGBUILD)
akonadi/repos/extra-i686/akonadi.install
(from rev 188069, akonadi/trunk/akonadi.install)
akonadi/repos/extra-i686/boost153.patch
(from rev 188069, akonadi/trunk/boost153.patch)
akonadi/repos/extra-x86_64/PKGBUILD
(from rev 188069, akonadi/trunk/PKGBUILD)
akonadi/repos/extra-x86_64/akonadi.install
(from rev 188069, akonadi/trunk/akonadi.install)
akonadi/repos/extra-x86_64/boost153.patch
(from rev 188069, akonadi/trunk/boost153.patch)
Deleted:
akonadi/repos/extra-i686/PKGBUILD
akonadi/repos/extra-i686/akonadi.install
akonadi/repos/extra-x86_64/PKGBUILD
akonadi/repos/extra-x86_64/akonadi.install
------------------------------+
/PKGBUILD | 84 +++++++++++++++++++++++++++++++++++++++++
/akonadi.install | 22 ++++++++++
extra-i686/PKGBUILD | 32 ---------------
extra-i686/akonadi.install | 11 -----
extra-i686/boost153.patch | 27 +++++++++++++
extra-x86_64/PKGBUILD | 32 ---------------
extra-x86_64/akonadi.install | 11 -----
extra-x86_64/boost153.patch | 27 +++++++++++++
8 files changed, 160 insertions(+), 86 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-06-08 08:31:22 UTC (rev 188069)
+++ extra-i686/PKGBUILD 2013-06-08 08:31:33 UTC (rev 188070)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=akonadi
-pkgver=1.9.2
-pkgrel=1
-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')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bdce288f4b91055d69f35c26dab276d0')
-
-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
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: akonadi/repos/extra-i686/PKGBUILD (from rev 188069, akonadi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-06-08 08:31:33 UTC (rev 188070)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=akonadi
+pkgver=1.9.2
+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=('cmake' 'automoc4' 'boost' 'postgresql')
+optdepends=('postgresql: PostgreSQL backend')
+install="${pkgname}.install"
+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() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
+ -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+ -DAKONADI_BUILD_TESTS=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/akonadi.install
===================================================================
--- extra-i686/akonadi.install 2013-06-08 08:31:22 UTC (rev 188069)
+++ extra-i686/akonadi.install 2013-06-08 08:31:33 UTC (rev 188070)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: akonadi/repos/extra-i686/akonadi.install (from rev 188069, akonadi/trunk/akonadi.install)
===================================================================
--- extra-i686/akonadi.install (rev 0)
+++ extra-i686/akonadi.install 2013-06-08 08:31:33 UTC (rev 188070)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: akonadi/repos/extra-i686/boost153.patch (from rev 188069, akonadi/trunk/boost153.patch)
===================================================================
--- extra-i686/boost153.patch (rev 0)
+++ extra-i686/boost153.patch 2013-06-08 08:31:33 UTC (rev 188070)
@@ -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;
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-06-08 08:31:22 UTC (rev 188069)
+++ extra-x86_64/PKGBUILD 2013-06-08 08:31:33 UTC (rev 188070)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=akonadi
-pkgver=1.9.2
-pkgrel=1
-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')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('bdce288f4b91055d69f35c26dab276d0')
-
-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
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: akonadi/repos/extra-x86_64/PKGBUILD (from rev 188069, akonadi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-06-08 08:31:33 UTC (rev 188070)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=akonadi
+pkgver=1.9.2
+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=('cmake' 'automoc4' 'boost' 'postgresql')
+optdepends=('postgresql: PostgreSQL backend')
+install="${pkgname}.install"
+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() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE \
+ -DQT_QMAKE_EXECUTABLE=qmake-qt4 \
+ -DAKONADI_BUILD_TESTS=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/akonadi.install
===================================================================
--- extra-x86_64/akonadi.install 2013-06-08 08:31:22 UTC (rev 188069)
+++ extra-x86_64/akonadi.install 2013-06-08 08:31:33 UTC (rev 188070)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: akonadi/repos/extra-x86_64/akonadi.install (from rev 188069, akonadi/trunk/akonadi.install)
===================================================================
--- extra-x86_64/akonadi.install (rev 0)
+++ extra-x86_64/akonadi.install 2013-06-08 08:31:33 UTC (rev 188070)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: akonadi/repos/extra-x86_64/boost153.patch (from rev 188069, akonadi/trunk/boost153.patch)
===================================================================
--- extra-x86_64/boost153.patch (rev 0)
+++ extra-x86_64/boost153.patch 2013-06-08 08:31:33 UTC (rev 188070)
@@ -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;
+
More information about the arch-commits
mailing list