diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-12-27 23:55:53 +0000 |
| commit | 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 (patch) | |
| tree | fbfdff322b28d9a3c37e6e31c94caf1d8e48dac1 /extra/sqlite | |
| parent | d53c44f055929b18d7d1b25f8367ee5836c435fc (diff) | |
Fri Dec 27 23:54:04 UTC 2013
Diffstat (limited to 'extra/sqlite')
| -rw-r--r-- | extra/sqlite/PKGBUILD | 18 | ||||
| -rw-r--r-- | extra/sqlite/xbmc.patch | 22 |
2 files changed, 6 insertions, 34 deletions
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 9aecd02d6..f704fec82 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 198439 2013-10-30 14:52:53Z allan $ +# $Id: PKGBUILD 201374 2013-12-09 21:50:07Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') -_amalgamationver=3080100 +_amalgamationver=3080200 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.1 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') license=('custom:Public Domain') @@ -17,12 +17,10 @@ makedepends=('tcl' 'readline') 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/2013/sqlite-autoconf-$_amalgamationver.tar.gz http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip - xbmc.patch license.txt) options=('!emptydirs') -sha1sums=('42464b07df2d6f8aa28f73ce4cc6d48b47be810e' - 'd7cb698f32318fbf5dce9f10c9cd7b84c3d70105' - '01bcbffc422b354a4ad6737e472f06b321ce52ef' +sha1sums=('6033ef603ce221d367c665477514d972ef1dc90e' + 'b9cbd42d08b8c1ce96656a6b111e918bb515b605' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { @@ -31,10 +29,6 @@ build() { # build sqlite cd "$srcdir"/sqlite-autoconf-$_amalgamationver - # fix http://www.sqlite.org/src/info/9aac4e588c?sbs=0 - # https://bugs.archlinux.org/task/37417 - patch -Np1 -i $srcdir/xbmc.patch - ./configure --prefix=/usr \ --disable-static make diff --git a/extra/sqlite/xbmc.patch b/extra/sqlite/xbmc.patch deleted file mode 100644 index 3a58dd242..000000000 --- a/extra/sqlite/xbmc.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/where.c -================================================================== ---- src/sqlite3.c -+++ src/sqlite3.c -@@ -876,11 +876,14 @@ - while( pScan->iEquiv<=pScan->nEquiv ){ - iCur = pScan->aEquiv[pScan->iEquiv-2]; - iColumn = pScan->aEquiv[pScan->iEquiv-1]; - while( (pWC = pScan->pWC)!=0 ){ - for(pTerm=pWC->a+k; k<pWC->nTerm; k++, pTerm++){ -- if( pTerm->leftCursor==iCur && pTerm->u.leftColumn==iColumn ){ -+ if( pTerm->leftCursor==iCur -+ && pTerm->u.leftColumn==iColumn -+ && (pScan->iEquiv<=2 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin)) -+ ){ - if( (pTerm->eOperator & WO_EQUIV)!=0 - && pScan->nEquiv<ArraySize(pScan->aEquiv) - ){ - int j; - pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight); - - |