Fix building with SQLITE_OMIT_WAL defined (bug #353967).

Package-Manager: portage-2.2.0_alpha25_p9/cvs/Linux x86_64

4 files changed, 73 insertions, 4 deletions

diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index b190620bd302..799624207e66 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/sqlite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.361 2011/02/27 12:01:59 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.362 2011/02/27 18:21:04 arfrever Exp $
+
+  27 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sqlite-3.7.5.ebuild, +files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch:
+  Fix building with SQLITE_OMIT_WAL defined (bug #353967).
 
   27 Feb 2011; Tobias Klausmann <klausman@gentoo.org> sqlite-3.7.3.ebuild:
   Stable on alpha, bug #348079
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 1899866a01a1..82998f2462ac 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -6,6 +6,7 @@ AUX sqlite-3.6.22-interix-fixes-amalgamation.patch 717 RMD160 dfae5e2d22cddad5a2
 AUX sqlite-3.6.22-interix-fixes.patch 614 RMD160 0492235d52c003620a84888c36541bd8f40b44d2 SHA1 48cacb6fcd220cf1875d1fc5c640ee9cd5b3dd2f SHA256 1990fca1660bf0781875dbc699078c9eac54a643e4fece82faf765f7ccf8aaad
 AUX sqlite-3.7.3-icu_tests.patch 7858 RMD160 eb2a653de13a2e276fc67b7784a91b85897c1a27 SHA1 578e82fd6765b0f953dbbf5f5cefe115a027a063 SHA256 4b4a92cd1e09c0945282862acde883ddc20ff01ce811b682dbd25c11fcc2320b
 AUX sqlite-3.7.4-utimes.patch 840 RMD160 d8c400732096c20bc9054bba90028ee831b07d19 SHA1 47b26eaa946a7a37bb0e68a41218f86d135493a5 SHA256 9570b925e7c34eea89fd6ca0a2a734dd24f99efdcfa295a1a80e999a75fae4fb
+AUX sqlite-3.7.5-SQLITE_OMIT_WAL.patch 2245 RMD160 76eda21a44ad63f5fab3b9508eda51ed76a1f947 SHA1 4b350d04581f49d72890ddc2db82819383460de6 SHA256 e4647b99b1cfac9576918643e9cb6b66898d02564f4ad832d558f4c46995daa3
 AUX sqlite-3.7.5-utimes.patch 830 RMD160 168a123fedcd50db1141ae32f6bb647349f9e65a SHA1 e6f541f3748a19b8649d4b1e7f496e540128219d SHA256 e25d602aa72c5b607f82900598b61493d556ed202df2c7fe4e15072dd556e6c6
 DIST sqlite-2.8.16.tar.gz 981834 RMD160 df60e84f16ccd8b6b8e86dabfe6bf40f6a3dc136 SHA1 7bef329f78628de252c289bda7cea6f86adcc42e SHA256 d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
 DIST sqlite-3.7.2.tar.gz 3309139 RMD160 8f831cebeec41b21a0e009df1966822ab0546ff4 SHA1 b5e66d8d52ad7ef4761d0b10590bc24442b965be SHA256 bb53cad58f1c502662644d88e24a552dc8de982d650f80d8debaf13b15bb3b8a
@@ -24,6 +25,6 @@ EBUILD sqlite-2.8.16-r4.ebuild 2693 RMD160 f0d7c0c813b135e75e32bc5489080d6d32492
 EBUILD sqlite-3.7.2.ebuild 4705 RMD160 966f6f42913dc5be95b3fb5e0db958fa57b8a0d3 SHA1 9d2f6223487d699f6720ec80e183999c0ff8b3cf SHA256 d02efb1e66b1f8faa9c76c1b80eff2d7a10ae437764568f41b7faa9c4bcd9ca2
 EBUILD sqlite-3.7.3.ebuild 4712 RMD160 ff197463e2b0fb2d5eddfcc68dc4fdcdf5739ae9 SHA1 ab0717c65b90609463fb8f51d4982871e1245548 SHA256 407f1ae063a12b93d722549f4587227b7579a01bd08e232fc59ad1bc02fc950b
 EBUILD sqlite-3.7.4.ebuild 4417 RMD160 e5185f2888c7f7a47680a27e1d44bec571672973 SHA1 6325bd9cd90af0221f0d2502b49e099505320f66 SHA256 fc6f0bddb61b10077b61836e56153e51eddabe450b2533b8e8b5bc5dddab804a
-EBUILD sqlite-3.7.5.ebuild 4495 RMD160 0e2d57c87eb558f106357147199108d4762f6adc SHA1 497d15242d6a4478b6769d5f649893af33422009 SHA256 194c7f98ec57986bc9ae9256d08282ee8c4e6ceedbff168418e0d119048b7f5f
-MISC ChangeLog 49993 RMD160 33f3fb9ceaead4a0a5e1b8ff4de02572c3f49b57 SHA1 ad02c3b7c9270841f7d440d63bf7408342a316f8 SHA256 cc76abca5454ed28115117214631d673ac452d98ec0e2d206045b0172b330060
+EBUILD sqlite-3.7.5.ebuild 4545 RMD160 3642503874454cfc5dcf3af53c9718971a5eef64 SHA1 1347b5a34b3fef0827c2f694cf2d2ac2c7f98889 SHA256 4bcaea9f5b6d0d03dacba076788d01fffe7770e530c52af165c623682807d73e
+MISC ChangeLog 50192 RMD160 48033105acefb43c753d2402d772b514d34b1376 SHA1 1f93e474be798ee46c61dd916c90e6104307db86 SHA256 f62283a8ca576f7aae1d10912d10a59260c7730adfc6ee1c28775c663ba0db5a
 MISC metadata.xml 1011 RMD160 02768455c7a2f2e980fcd51e16105d1a030a69cf SHA1 98ba789e4120f8d0a1e2f49285f6dbf49e0a35d0 SHA256 4b2dc7fa04d3909cac1f4b764daaddb237e5c4f9a05998d7fd04dc42a5775aae
diff --git a/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch b/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch
new file mode 100644
index 000000000000..e49585643db8
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.7.5-SQLITE_OMIT_WAL.patch
@@ -0,0 +1,63 @@
+http://www.sqlite.org/src/ci/b9b48dd8dd
+
+--- src/pager.c
++++ src/pager.c
+@@ -2851,6 +2851,28 @@
+   return rc;
+ }
+ 
++/*
++** Update the value of the change-counter at offsets 24 and 92 in
++** the header and the sqlite version number at offset 96.
++**
++** This is an unconditional update.  See also the pager_incr_changecounter()
++** routine which only updates the change-counter if the update is actually
++** needed, as determined by the pPager->changeCountDone state variable.
++*/
++static void pager_write_changecounter(PgHdr *pPg){
++  u32 change_counter;
++
++  /* Increment the value just read and write it back to byte 24. */
++  change_counter = sqlite3Get4byte((u8*)pPg->pPager->dbFileVers)+1;
++  put32bits(((char*)pPg->pData)+24, change_counter);
++
++  /* Also store the SQLite version number in bytes 96..99 and in
++  ** bytes 92..95 store the change counter for which the version number
++  ** is valid. */
++  put32bits(((char*)pPg->pData)+92, change_counter);
++  put32bits(((char*)pPg->pData)+96, SQLITE_VERSION_NUMBER);
++}
++
+ #ifndef SQLITE_OMIT_WAL
+ /*
+ ** This function is invoked once for each page that has already been 
+@@ -2921,29 +2943,6 @@
+   return rc;
+ }
+ 
+-
+-/*
+-** Update the value of the change-counter at offsets 24 and 92 in
+-** the header and the sqlite version number at offset 96.
+-**
+-** This is an unconditional update.  See also the pager_incr_changecounter()
+-** routine which only updates the change-counter if the update is actually
+-** needed, as determined by the pPager->changeCountDone state variable.
+-*/
+-static void pager_write_changecounter(PgHdr *pPg){
+-  u32 change_counter;
+-
+-  /* Increment the value just read and write it back to byte 24. */
+-  change_counter = sqlite3Get4byte((u8*)pPg->pPager->dbFileVers)+1;
+-  put32bits(((char*)pPg->pData)+24, change_counter);
+-
+-  /* Also store the SQLite version number in bytes 96..99 and in
+-  ** bytes 92..95 store the change counter for which the version number
+-  ** is valid. */
+-  put32bits(((char*)pPg->pData)+92, change_counter);
+-  put32bits(((char*)pPg->pData)+96, SQLITE_VERSION_NUMBER);
+-}
+-
+ /*
+ ** This function is a wrapper around sqlite3WalFrames(). As well as logging
+ ** the contents of the list of pages headed by pList (connected by pDirty),
diff --git a/dev-db/sqlite/sqlite-3.7.5.ebuild b/dev-db/sqlite/sqlite-3.7.5.ebuild
index 534d69c14165..ad525ed6a4cb 100644
--- a/dev-db/sqlite/sqlite-3.7.5.ebuild
+++ b/dev-db/sqlite/sqlite-3.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.5.ebuild,v 1.1 2011/02/06 14:03:29 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.7.5.ebuild,v 1.2 2011/02/27 18:21:04 arfrever Exp $
 
 EAPI="3"
 
@@ -51,6 +51,7 @@ src_prepare() {
 	else
 		epatch "${FILESDIR}/${P}-utimes.patch"
 		epatch "${FILESDIR}/${PN}-3.6.22-dlopen.patch"
+		epatch "${FILESDIR}/${P}-SQLITE_OMIT_WAL.patch"
 	fi
 
 	eautoreconf