summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Schiffbauer <mschiff@gentoo.org>2013-07-12 14:58:14 +0000
committerMarc Schiffbauer <mschiff@gentoo.org>2013-07-12 14:58:14 +0000
commit2be1063fe57f305c90d913227d8e4c6bcb486e66 (patch)
treedd93068d16caab924f3eaa3091b373f3d88bbf92 /app-office/akonadi-server
parentConvert to distutils-r1. Drop tests as they require LDAP server. (diff)
downloadgentoo-2-2be1063fe57f305c90d913227d8e4c6bcb486e66.tar.gz
gentoo-2-2be1063fe57f305c90d913227d8e4c6bcb486e66.tar.bz2
gentoo-2-2be1063fe57f305c90d913227d8e4c6bcb486e66.zip
Bump revision. Backported upstream fix 'fdedc830 - Unbreak akonadi on Postgres'
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x296C6CCA35A64134)
Diffstat (limited to 'app-office/akonadi-server')
-rw-r--r--app-office/akonadi-server/ChangeLog10
-rw-r--r--app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild128
-rw-r--r--app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch22
3 files changed, 159 insertions, 1 deletions
diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 2959d7dccac3..892d28a91d27 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-office/akonadi-server
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.117 2013/07/10 19:55:01 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.118 2013/07/12 14:58:14 mschiff Exp $
+
+*akonadi-server-1.10.0-r1 (12 Jul 2013)
+
+ 12 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org>
+ +akonadi-server-1.10.0-r1.ebuild,
+ +files/akonadi-server-1.10.0-pgsql-fix.patch:
+ Bump revision. Backported upstream fix 'fdedc830 - Unbreak akonadi on
+ Postgres'
*akonadi-server-1.10.0 (10 Jul 2013)
diff --git a/app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..50eeec0f20a5
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild,v 1.1 2013/07/12 14:58:14 mschiff Exp $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+ scm_eclass=git-2
+ EGIT_REPO_URI="git://anongit.kde.org/akonadi"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+ dev-libs/boost:=
+ >=dev-libs/soprano-2.6.51
+ x11-misc/shared-mime-info
+ qt4? (
+ >=dev-qt/qtcore-4.5.0:4
+ >=dev-qt/qtdbus-4.5.0:4
+ >=dev-qt/qtgui-4.5.0:4[dbus]
+ >=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
+ >=dev-qt/qttest-4.5.0:4
+ )
+ qt5? (
+ >=dev-libs/soprano-2.6.51[-qt4,qt5]
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5[mysql?,postgres?]
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+ dev-libs/libxslt
+ >=dev-util/automoc-0.9.88
+ test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+ postgres? ( dev-db/postgresql-server )
+"
+
+pkg_setup() {
+ # Set default storage backend in order: MySQL, SQLite PostgreSQL
+ # reverse driver check to keep the order
+ if use postgres; then
+ DRIVER="QPSQL"
+ AVAILABLE+=" ${DRIVER}"
+ fi
+
+ if use sqlite; then
+ DRIVER="QSQLITE3"
+ AVAILABLE+=" ${DRIVER}"
+ fi
+
+ if use mysql; then
+ DRIVER="QMYSQL"
+ AVAILABLE+=" ${DRIVER}"
+ fi
+
+ # Notify about MySQL is recommend by upstream
+ if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+ ewarn
+ ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+ ewarn "user configuration. This is the backend recommended by KDE upstream."
+ ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+ ewarn "backend anymore."
+ ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+ ewarn "Available drivers are:${AVAILABLE}"
+ ewarn
+ fi
+}
+
+src_configure() {
+ epatch "${FILESDIR}/${P}-fix-pgsql.patch"
+
+ local mycmakeargs=(
+ -DAKONADI_USE_STRIGI_SEARCH=OFF
+ -DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+ $(cmake-utils_use test AKONADI_BUILD_TESTS)
+ $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+ $(cmake-utils_use qt5 QT5_BUILD)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_test() {
+ export $(dbus-launch)
+ cmake-utils_src_test
+}
+
+src_install() {
+ # Who knows, maybe it accidentally fixes our permission issues
+ cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+ insinto /usr/share/config/akonadi
+ doins "${T}"/akonadiserverrc
+
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ elog "${DRIVER} has been set as your default akonadi storage backend."
+ elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+ elog "Available drivers are: ${AVAILABLE}"
+}
diff --git a/app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch b/app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch
new file mode 100644
index 000000000000..253b405aae72
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.10.0-pgsql-fix.patch
@@ -0,0 +1,22 @@
+commit fdedc830ca5061f45cd2412c11566ca84806c427
+Author: Andras Mantia <amantia@kde.org>
+Date: Fri Jul 12 15:03:36 2013 +0300
+
+ Unbreak akonadi on Postgres
+
+diff --git a/server/src/storage/datastore.cpp b/server/src/storage/datastore.cpp
+index f5a1bc6..93e1ff2 100644
+--- a/server/src/storage/datastore.cpp
++++ b/server/src/storage/datastore.cpp
+@@ -208,8 +208,9 @@ bool DataStore::setItemsFlags( const PimItem::List &items, const QVector<Flag> &
+ }
+
+ QueryBuilder qb2( PimItemFlagRelation::tableName(), QueryBuilder::Insert );
+- qb2.setColumnValue( PimItemFlagRelation::leftFullColumnName(), insIds );
+- qb2.setColumnValue( PimItemFlagRelation::rightFullColumnName(), insFlags );
++ qb2.setColumnValue( PimItemFlagRelation::leftColumn(), insIds );
++ qb2.setColumnValue( PimItemFlagRelation::rightColumn(), insFlags );
++ qb2.setIdentificationColumn( QString() );
+ if ( !qb2.exec() ) {
+ return false;
+ }