[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/20.0.1132.27_r140692-1-1-gc0e9499
Giuseppe Iuculano
iuculano at debian.org
Tue Jun 12 09:30:37 UTC 2012
The following commit has been merged in the master branch:
commit c0e949994e43c7615d0ac625609fc4237c56fbe8
Author: Giuseppe Iuculano <iuculano at debian.org>
Date: Tue Jun 12 11:06:24 2012 +0200
Improved sqlite patch.
Thanks: Andrew Chant
Closes: #676636
diff --git a/debian/patches/sqlite.patch b/debian/patches/sqlite.patch
index 95abf36..37b5f4b 100644
--- a/debian/patches/sqlite.patch
+++ b/debian/patches/sqlite.patch
@@ -26,3 +26,31 @@ Index: sid/src/third_party/sqlite/src/ext/fts3/fts3_write.c
if( pE ){
aElem = &pE;
nElem = 1;
+Index: sid/src/third_party/sqlite/amalgamation/sqlite3.c
+===================================================================
+--- sid.orig/src/third_party/sqlite/amalgamation/sqlite3.c 2012-05-19 16:54:35.000000000 +0200
++++ sid/src/third_party/sqlite/amalgamation/sqlite3.c 2012-06-12 11:03:19.971054836 +0200
+@@ -119149,13 +119149,13 @@
+ Fts3SegReader **ppReader /* OUT: SegReader for pending-terms */
+ ){
+ Fts3SegReader *pReader = 0; /* Fts3SegReader object to return */
++ Fts3HashElem *pE; /* Iterator variable */
+ Fts3HashElem **aElem = 0; /* Array of term hash entries to scan */
+ int nElem = 0; /* Size of array at aElem */
+ int rc = SQLITE_OK; /* Return Code */
+
+ if( isPrefix ){
+ int nAlloc = 0; /* Size of allocated array at aElem */
+- Fts3HashElem *pE = 0; /* Iterator variable */
+
+ for(pE=fts3HashFirst(&p->pendingTerms); pE; pE=fts3HashNext(pE)){
+ char *zKey = (char *)fts3HashKey(pE);
+@@ -119187,7 +119187,7 @@
+ }
+
+ }else{
+- Fts3HashElem *pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
++ pE = fts3HashFindElem(&p->pendingTerms, zTerm, nTerm);
+ if( pE ){
+ aElem = &pE;
+ nElem = 1;
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list