Remove assert that requires exact sqlite version 3.6.23

Package-Manager: portage-2.2_rc77/cvs/Linux x86_64

5 files changed, 34 insertions, 6 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/Manifest b/app-office/akonadi-server/Manifest
index ee1874f4534d..46d28af7532e 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,7 +1,8 @@
+AUX akonadi-server-1.4.0-remove-sqlite-version-assert.patch 531 RMD160 90bc0d4534fcf731610ca798089fe0827f934de2 SHA1 afa10f2e7635b7a0b3ed64d5bde59001d7e93cdf SHA256 c2c34dc8cc0da230121ce1832feca544c5dcaf5e42dc3ce819df1bb736ca79dd
 DIST akonadi-1.3.1.tar.bz2 193500 RMD160 487408ad3ac49983b9151aba358225f203ed19a1 SHA1 b6e97634878fe52785f3dec7d6394a18579d4a50 SHA256 4b9e99c20d0195ef7e477b399fed21e0533b9863f66a0650bfbddf18b73676dd
 DIST akonadi-1.4.0.tar.bz2 229349 RMD160 a69885807127684aa40e6203bd76cc09275dc427 SHA1 a83943aa46537fee4e07953fedf29f5c13487937 SHA256 85da6b75ce069874520e078cc5f75f2f4ebd91ae184bcb78eb203f8f7d812ea5
 EBUILD akonadi-server-1.3.1.ebuild 2150 RMD160 dc2be0043c0c6ed61cc0f336ca48176a5e6d4bf9 SHA1 64cb63a490ab8309d5101fdc3771a44ff29c4c27 SHA256 6b02302e1b7ab386950a600d5454bf12f79ce7f8e52c778e638a7040a296878f
-EBUILD akonadi-server-1.4.0-r1.ebuild 2617 RMD160 a861b2cfa6ac1516e9446b5ccec9da8304cca39c SHA1 830f7b0337480f027b87f94da137eea31e58dec1 SHA256 548338510e5fafb2cce054f0e4125fdd347e90289278d7748fffdb5f93224732
-EBUILD akonadi-server-1.4.0.ebuild 2156 RMD160 b440cfa87409934b0e99067d51b995f6c2bd80a8 SHA1 91e41c997d6aac832731a5471c15efb1e4965dae SHA256 1f2d73cd014eb73c5d18509323d0362eba7df4f520976aa1b01816804afb134c
-MISC ChangeLog 6649 RMD160 4851a51a739669e38d10792df58cddbf3b2bc5a4 SHA1 9b80a45d52d242c00cc8df673bc4bafbbdb8d938 SHA256 5ed3e7eb9d4690dca1f1c1acc9cde7655957dffd4844af55cf42470e67a5444f
+EBUILD akonadi-server-1.4.0-r2.ebuild 2685 RMD160 d00b3650485f2c284a72a51d91ebda9402a5263c SHA1 0c3ce244bfa14456dc9ff98993a10fe9353ed83b SHA256 180ad67a75ca2727760f6a7cd4ffd7cb70fb0004431dc4527e5f8cb4393df8bc
+EBUILD akonadi-server-1.4.0.ebuild 2223 RMD160 8b9499f35cce43746e9525046cde42c240a41e6b SHA1 801afce02577277c8dc476bd20264e2ebde25dc6 SHA256 5f8f239f5991714f9068311db5fd0dc72130ad330354755296740109f57c1e9e
+MISC ChangeLog 6967 RMD160 e06bb23219b6e4c85a5506d7b3b12819a094b834 SHA1 864475e688024b0bb0add9c9acc002160fd1a0fa SHA256 53d6ba24bcd95abf8a2edf2c3b6b8648eff495a67c6882b1e31668bac94196eb
 MISC metadata.xml 236 RMD160 c5cc6cb9745f9f6e3c7358482117892cbc866eb2 SHA1 d1bd263bd36cfc701e7ae12fb77e24d3f6556a88 SHA256 3bf214b7d5dabbbd8f2d607f6166647d91c5d0b7f166a4d5615da31995da06b6
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);