diff options
| author | root <root@rshg054.dnsready.net> | 2013-10-30 01:04:25 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-10-30 01:04:25 -0700 |
| commit | 7c151ac5589d3dbef5972f69a62b847ecf565bfa (patch) | |
| tree | 9450bd13169930e602731e9c431b79fdaaad2c02 /extra/sqlite | |
| parent | 38b1ce25596ae456fefb3214a73c3d1005da568f (diff) | |
Wed Oct 30 01:01:59 PDT 2013
Diffstat (limited to 'extra/sqlite')
| -rw-r--r-- | extra/sqlite/PKGBUILD | 11 | ||||
| -rw-r--r-- | extra/sqlite/xbmc.patch | 22 |
2 files changed, 31 insertions, 2 deletions
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index cadeb5c13..491c50fdc 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196768 2013-10-18 13:37:47Z andyrtr $ +# $Id: PKGBUILD 197765 2013-10-29 19:53:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -8,7 +8,7 @@ _amalgamationver=3080100 _docver=${_amalgamationver} #_docver=3080001 pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') license=('custom:Public Domain') @@ -17,10 +17,12 @@ 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=('!libtool' '!emptydirs') sha1sums=('42464b07df2d6f8aa28f73ce4cc6d48b47be810e' 'd7cb698f32318fbf5dce9f10c9cd7b84c3d70105' + '01bcbffc422b354a4ad6737e472f06b321ce52ef' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { @@ -28,6 +30,11 @@ 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 new file mode 100644 index 000000000..3a58dd242 --- /dev/null +++ b/extra/sqlite/xbmc.patch @@ -0,0 +1,22 @@ +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); + + |