[arch-commits] Commit in akonadi (9 files)
Andrea Scarpino
andrea at nymeria.archlinux.org
Sun Jul 7 17:15:24 UTC 2013
Date: Sunday, July 7, 2013 @ 19:15:24
Author: andrea
Revision: 189766
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
akonadi/repos/staging-i686/
akonadi/repos/staging-i686/PKGBUILD
(from rev 189765, akonadi/trunk/PKGBUILD)
akonadi/repos/staging-i686/akonadi.install
(from rev 189765, akonadi/trunk/akonadi.install)
akonadi/repos/staging-i686/boost153.patch
(from rev 189765, akonadi/trunk/boost153.patch)
akonadi/repos/staging-x86_64/
akonadi/repos/staging-x86_64/PKGBUILD
(from rev 189765, akonadi/trunk/PKGBUILD)
akonadi/repos/staging-x86_64/akonadi.install
(from rev 189765, akonadi/trunk/akonadi.install)
akonadi/repos/staging-x86_64/boost153.patch
(from rev 189765, akonadi/trunk/boost153.patch)
Modified:
akonadi/kde-unstable/PKGBUILD
--------------------------------------+
kde-unstable/PKGBUILD | 4 +--
repos/staging-i686/PKGBUILD | 42 +++++++++++++++++++++++++++++++++
repos/staging-i686/akonadi.install | 11 ++++++++
repos/staging-i686/boost153.patch | 27 +++++++++++++++++++++
repos/staging-x86_64/PKGBUILD | 42 +++++++++++++++++++++++++++++++++
repos/staging-x86_64/akonadi.install | 11 ++++++++
repos/staging-x86_64/boost153.patch | 27 +++++++++++++++++++++
7 files changed, 162 insertions(+), 2 deletions(-)
Modified: kde-unstable/PKGBUILD
===================================================================
--- kde-unstable/PKGBUILD 2013-07-07 17:15:15 UTC (rev 189765)
+++ kde-unstable/PKGBUILD 2013-07-07 17:15:24 UTC (rev 189766)
@@ -4,7 +4,7 @@
pkgname=akonadi
pkgver=1.9.80
-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'
@@ -17,7 +17,7 @@
md5sums=('727cf592dc9f5eece5174c83347fc55b')
prepare() {
- mkdir -p build
+ mkdir build
}
build() {
Copied: akonadi/repos/staging-i686/PKGBUILD (from rev 189765, akonadi/trunk/PKGBUILD)
===================================================================
--- repos/staging-i686/PKGBUILD (rev 0)
+++ repos/staging-i686/PKGBUILD 2013-07-07 17:15:24 UTC (rev 189766)
@@ -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=3
+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 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
+}
Copied: akonadi/repos/staging-i686/akonadi.install (from rev 189765, akonadi/trunk/akonadi.install)
===================================================================
--- repos/staging-i686/akonadi.install (rev 0)
+++ repos/staging-i686/akonadi.install 2013-07-07 17:15:24 UTC (rev 189766)
@@ -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/staging-i686/boost153.patch (from rev 189765, akonadi/trunk/boost153.patch)
===================================================================
--- repos/staging-i686/boost153.patch (rev 0)
+++ repos/staging-i686/boost153.patch 2013-07-07 17:15:24 UTC (rev 189766)
@@ -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;
+
Copied: akonadi/repos/staging-x86_64/PKGBUILD (from rev 189765, akonadi/trunk/PKGBUILD)
===================================================================
--- repos/staging-x86_64/PKGBUILD (rev 0)
+++ repos/staging-x86_64/PKGBUILD 2013-07-07 17:15:24 UTC (rev 189766)
@@ -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=3
+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 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
+}
Copied: akonadi/repos/staging-x86_64/akonadi.install (from rev 189765, akonadi/trunk/akonadi.install)
===================================================================
--- repos/staging-x86_64/akonadi.install (rev 0)
+++ repos/staging-x86_64/akonadi.install 2013-07-07 17:15:24 UTC (rev 189766)
@@ -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/staging-x86_64/boost153.patch (from rev 189765, akonadi/trunk/boost153.patch)
===================================================================
--- repos/staging-x86_64/boost153.patch (rev 0)
+++ repos/staging-x86_64/boost153.patch 2013-07-07 17:15:24 UTC (rev 189766)
@@ -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