[arch-commits] Commit in sqlite/trunk (PKGBUILD sqlite-nautilus.patch)
Andreas Radke
andyrtr at nymeria.archlinux.org
Fri Jun 6 22:03:38 UTC 2014
Date: Saturday, June 7, 2014 @ 00:03:38
Author: andyrtr
Revision: 214340
upgpkg: sqlite 3.8.5-1
upstream update 3.8.5
Modified:
sqlite/trunk/PKGBUILD
Deleted:
sqlite/trunk/sqlite-nautilus.patch
-----------------------+
PKGBUILD | 22 +++++++---------------
sqlite-nautilus.patch | 41 -----------------------------------------
2 files changed, 7 insertions(+), 56 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-06 21:56:52 UTC (rev 214339)
+++ PKGBUILD 2014-06-06 22:03:38 UTC (rev 214340)
@@ -4,11 +4,11 @@
pkgbase="sqlite"
pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc')
-_amalgamationver=3080403
+_amalgamationver=3080500
_docver=${_amalgamationver}
#_docver=3080001
-pkgver=3.8.4.3
-pkgrel=2
+pkgver=3.8.5
+pkgrel=1
pkgdesc="A C library that implements an SQL database engine"
arch=('i686' 'x86_64')
license=('custom:Public Domain')
@@ -17,20 +17,12 @@
source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
http://www.sqlite.org/2014/sqlite-autoconf-$_amalgamationver.tar.gz
http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip
- license.txt
- sqlite-nautilus.patch)
+ license.txt)
options=('!emptydirs')
-sha1sums=('70f3b100fa22e5bfebfe1b0a2102612e3c6c53fb'
- 'ce8615799a9da7fc9d2cbcd2774d77da4ba72417'
- 'f34f6daa4ab3073d74e774aad21d66878cf26853'
- '4e9a4f80c91bbaf80f0f45b9b97fb1cbe3464bc7')
+sha1sums=('7f667e10ccebc26ab2086b8a30cb0a600ca0acae'
+ 'c5655a4004095c50dc8403661e0ed02fd4191d57'
+ 'f34f6daa4ab3073d74e774aad21d66878cf26853')
-prepare() {
- cd "$srcdir"/sqlite-autoconf-$_amalgamationver
- # https://bugs.archlinux.org/task/39861
- patch -Np1 -i ${srcdir}/sqlite-nautilus.patch
-}
-
build() {
export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
Deleted: sqlite-nautilus.patch
===================================================================
--- sqlite-nautilus.patch 2014-06-06 21:56:52 UTC (rev 214339)
+++ sqlite-nautilus.patch 2014-06-06 22:03:38 UTC (rev 214340)
@@ -1,41 +0,0 @@
-Upstream fix for the issue that caused nautilus to crash.
-RHBZ: #1075889
-
---- src/sqlite3.c
-+++ src/sqlite3.c
-@@ -4855,18 +4855,10 @@
- ** rowid appears in the ORDER BY clause, the corresponding WhereLoop is
- ** automatically order-distinct.
- */
-
- assert( pOrderBy!=0 );
--
-- /* Sortability of virtual tables is determined by the xBestIndex method
-- ** of the virtual table itself */
-- if( pLast->wsFlags & WHERE_VIRTUALTABLE ){
-- testcase( nLoop>0 ); /* True when outer loops are one-row and match
-- ** no ORDER BY terms */
-- return pLast->u.vtab.isOrdered;
-- }
- if( nLoop && OptimizationDisabled(db, SQLITE_OrderByIdxJoin) ) return 0;
-
- nOrderBy = pOrderBy->nExpr;
- testcase( nOrderBy==BMS-1 );
- if( nOrderBy>BMS-1 ) return 0; /* Cannot optimize overly large ORDER BYs */
-@@ -4875,11 +4867,14 @@
- orderDistinctMask = 0;
- ready = 0;
- for(iLoop=0; isOrderDistinct && obSat<obDone && iLoop<=nLoop; iLoop++){
- if( iLoop>0 ) ready |= pLoop->maskSelf;
- pLoop = iLoop<nLoop ? pPath->aLoop[iLoop] : pLast;
-- assert( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0 );
-+ if( pLoop->wsFlags & WHERE_VIRTUALTABLE ){
-+ if( pLoop->u.vtab.isOrdered ) obSat = obDone;
-+ break;
-+ }
- iCur = pWInfo->pTabList->a[pLoop->iTab].iCursor;
-
- /* Mark off any ORDER BY term X that is a column in the table of
- ** the current loop for which there is term in the WHERE
- ** clause of the form X IS NULL or X=? that reference only outer
-
More information about the arch-commits
mailing list