Date: Tuesday, October 29, 2013 @ 19:40:50
Author: andyrtr
Revision: 197756
upgpkg: sqlite 3.8.1-2
add upstream patch for FS#37417
Added:
sqlite/trunk/xbmc.patch
Modified:
sqlite/trunk/PKGBUILD
------------+
PKGBUILD | 9 ++++++++-
xbmc.patch | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-10-29 18:05:53 UTC (rev 197755)
+++ PKGBUILD 2013-10-29 18:40:50 UTC (rev 197756)
@@ -8,7 +8,7 @@
_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 @@
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 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
Added: xbmc.patch
===================================================================
--- xbmc.patch (rev 0)
+++ xbmc.patch 2013-10-29 18:40:50 UTC (rev 197756)
@@ -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);
+
+
