Remove assert that requires exact sqlite version 3.6.23

(Portage version: 2.2_rc77/cvs/Linux x86_64)

4 files changed, 30 insertions, 3 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index ce283b22df16..d0488f204069 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.46 2010/09/07 17:59:23 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.47 2010/09/08 13:43:40 reavertm Exp $
+
+*akonadi-server-1.4.0-r2 (08 Sep 2010)
+
+  08 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  akonadi-server-1.4.0.ebuild, -akonadi-server-1.4.0-r1.ebuild,
+  +akonadi-server-1.4.0-r2.ebuild,
+  +files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch:
+  Remove assert that requires exact sqlite version 3.6.23
 
   07 Sep 2010; Maciej Mrozowski <reavertm@gentoo.org>
   -akonadi-server-1.2.1.ebuild:
diff --git a/app-office/akonadi-server/akonadi-server-1.4.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild
index 8399a11472de..f02ffa082983 100644
--- a/app-office/akonadi-server/akonadi-server-1.4.0-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.0-r1.ebuild,v 1.1 2010/09/07 17:45:48 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0-r2.ebuild,v 1.1 2010/09/08 13:43:40 reavertm Exp $
 
 EAPI="2"
 
@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${P/-server/}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove-sqlite-version-assert.patch"
+)
+
 pkg_setup() {
 	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
 	local available
diff --git a/app-office/akonadi-server/akonadi-server-1.4.0.ebuild b/app-office/akonadi-server/akonadi-server-1.4.0.ebuild
index c0592a7d4995..376ad3daea09 100644
--- a/app-office/akonadi-server/akonadi-server-1.4.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.0.ebuild,v 1.1 2010/09/06 02:58:06 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.4.0.ebuild,v 1.2 2010/09/08 13:43:40 reavertm Exp $
 
 EAPI="2"
 
@@ -35,6 +35,10 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${P/-server/}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove-sqlite-version-assert.patch"
+)
+
 src_install() {
 	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
 	if use mysql; then
diff --git a/app-office/akonadi-server/files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch b/app-office/akonadi-server/files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch
new file mode 100644
index 000000000000..2a14a7eb0f57
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.4.0-remove-sqlite-version-assert.patch
@@ -0,0 +1,11 @@
+diff -ru ../akonadi-1.4.0/qsqlite/src/qsql_sqlite.cpp ./qsqlite/src/qsql_sqlite.cpp
+--- ../akonadi-1.4.0/qsqlite/src/qsql_sqlite.cpp	2010-07-31 18:12:24.000000000 +0200
++++ ./qsqlite/src/qsql_sqlite.cpp	2010-09-08 15:23:16.152896580 +0200
+@@ -323,7 +323,6 @@
+ 
+     setSelect(false);
+ 
+-    Q_ASSERT(SQLITE_VERSION_NUMBER == 3006023);
+ #if (SQLITE_VERSION_NUMBER >= 3003011)
+ //    int res = sqlite3_prepare16_v2(d->access, query.constData(), (query.size() + 1) * sizeof(QChar),
+ //                                   &d->stmt, 0);